--- a/Makefile	Sat Jan 07 12:53:57 2006 +0000
+++ b/Makefile	Sat Jan 07 13:13:49 2006 +0000
@@ -412,15 +412,6 @@
 CDEFS += -DDEDICATED
 endif
 
-ifdef OSX
-ifdef STATIC
-ifdef UNIVERSAL_OTHER_HALF
-	STATIC:=
-	DYNAMIC_SDL_IN_STATIC:=1
-endif
-endif
-endif
-
 # SDL config
 ifdef WITH_SDL
 CDEFS += -DWITH_SDL
@@ -432,10 +423,6 @@
 endif
 endif
 
-ifdef DYNAMIC_SDL_IN_STATIC
-STATIC:=1
-endif
-
 # zlib config
 ifdef WITH_ZLIB
 	CDEFS +=  -DWITH_ZLIB
@@ -513,13 +500,6 @@
 	# set the endian flag for OSX, that can't fail
 	ENDIAN_FORCE:=PREPROCESSOR
 
-	ifdef UNIVERSAL_x86_PART
-		ifdef WITH_SDL
-			# ensure that changing libpathnames will not overwrite anything in the binary
-			LDFLAGS += -headerpad_max_install_names
-		endif
-	endif
-
 	ifndef DEDICATED
 		LIBS += -framework QuickTime
 	endif