Index: Makefile
===================================================================
--- Makefile	(revision 7858)
+++ Makefile	(working copy)
@@ -4,7 +4,7 @@
 
 BACKENDS      = allegro gdi opengl sdl sdl2 mixer_sdl posix
 COLOUR_DEPTHS = 0 16
-OSTYPES       = amiga beos cygwin freebsd haiku linux mingw mac
+OSTYPES       = amiga beos cygwin freebsd haiku linux mingw mac mac32
 
 ifeq ($(findstring $(BACKEND), $(BACKENDS)),)
   $(error Unkown BACKEND "$(BACKEND)", must be one of "$(BACKENDS)")
@@ -54,6 +54,13 @@
 # Haiku (needs to activate the GCC 4x)
       ifeq ($(OSTYPE),haiku)
         LIBS += -lnetwork -lbe
+       else
+# OSX (to force 32 bit build)
+       ifeq ($(OSTYPE),mac32)
+          CFLAGS += -arch i386
+          LDFLAGS += -arch i386 -Wl,-no_pie
+          OSTYPE = mac
+        endif
       endif
     endif
   endif
@@ -485,8 +492,9 @@
   endif
   ifeq ($(SDL_CONFIG),)
     ifeq ($(OSTYPE),mac)
-      SDL_CFLAGS  := -I/System/Libraries/Frameworks/SDL/Headers -Dmain=SDL_main
-      SDL_LDFLAGS := -framework SDL -framework Cocoa -I/System/Libraries/Frameworks/SDL/Headers SDLMain.m
+      # These paths are wrong per the SDL installation instructions. Being left so as to not affect the Nightly build server. Recommend using SDL2 for OSX anyways...
+      SDL_CFLAGS  := -I/Library/Frameworks/SDL.framework/Headers -Dmain=SDL_main
+      SDL_LDFLAGS := -framework SDL -framework Cocoa -I/Library/Frameworks/SDL.framework/Headers OSX/SDLMain.m
     else
       SDL_CFLAGS  := -I$(MINGDIR)/include/SDL -Dmain=SDL_main
       SDL_LDFLAGS := -lSDLmain -lSDL
@@ -516,8 +524,8 @@
   endif
   ifeq ($(SDL2_CONFIG),)
     ifeq ($(OSTYPE),mac)
-      SDL_CFLAGS  := -I/System/Libraries/Frameworks/SDL2/Headers -Dmain=SDL_main
-      SDL_LDFLAGS := -framework SDL2 -framework Cocoa -I/System/Libraries/Frameworks/SDL2/Headers SDLMain.m
+      SDL_CFLAGS  := -I/Library/Frameworks/SDL2.framework/Headers
+      SDL_LDFLAGS := -framework SDL2
     else
       SDL_CFLAGS  := -I$(MINGDIR)/include/SDL2 -Dmain=SDL_main
       SDL_LDFLAGS := -lSDL2main -lSDL2
Index: config.template
===================================================================
--- config.template	(revision 7858)
+++ config.template	(working copy)
@@ -22,6 +22,7 @@
 #OSTYPE = linux
 #OSTYPE = mingw
 #OSTYPE = mac
+#OSTYPE = mac32  # To target i386 on a x86_64 OSX system
 
 #DEBUG = 3    # Level 1-3, higher number means more debug-friendly, see Makefile
 #OPTIMISE = 1 # Add umpteen optimisation flags
@@ -35,7 +36,7 @@
 
 #MULTI_THREAD = 1 # Enable multithreading
 
-# Define these as empty strings, if you don't have the respective config program
+# Define these as empty strings, if you don't have the respective config program. e.g. OSX using framework SDL/SDL2 install
 #ALLEGRO_CONFIG = allegro-config
 #PNG_CONFIG     = pkg-config libpng
 #SDL_CONFIG     = sdl-config
Index: network/network.cc
===================================================================
--- network/network.cc	(revision 7858)
+++ network/network.cc	(working copy)
@@ -477,7 +477,7 @@
 
 void network_set_socket_nodelay( SOCKET sock )
 {
-#if (defined(TCP_NODELAY)  &&  !defined(__APPLE__))  ||  COLOUR_DEPTH == 0
+#if (defined(TCP_NODELAY)  ||  COLOUR_DEPTH == 0)
 	// do not wait to join small (command) packets when sending (may cause 200ms delay!)
 	// force this for dedicated servers
 	int b = 1;