From db3d226c526acbffb321ed71e4b05a0a202ea6e0 Mon Sep 17 00:00:00 2001
From: bjarni <bjarni@openttd.org>
Date: Sat, 7 Jan 2006 13:13:49 +0000
Subject: (svn r3383) -Code cleanup: [OSX] removed SDL support from FAT
 binaries as it caused problems for non-SDL builds 	FAT binaries now need
 to rely on COCOA drivers. SDL didn't work properly anyway

---
 Makefile | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 2f34526a9..16c053484 100644
--- a/Makefile
+++ b/Makefile
@@ -412,15 +412,6 @@ ifdef DEDICATED
 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 @@ LIBS += $(shell $(SDL-CONFIG) --libs)
 endif
 endif
 
-ifdef DYNAMIC_SDL_IN_STATIC
-STATIC:=1
-endif
-
 # zlib config
 ifdef WITH_ZLIB
 	CDEFS +=  -DWITH_ZLIB
@@ -513,13 +500,6 @@ ifdef OSX
 	# 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
-- 
cgit v1.2.3-54-g00ecf