summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2006-01-07 13:13:49 +0000
committerbjarni <bjarni@openttd.org>2006-01-07 13:13:49 +0000
commitdb3d226c526acbffb321ed71e4b05a0a202ea6e0 (patch)
tree1255a001e325f00cd2fed755e3af0a2853e756e7 /Makefile
parenta8a2b93df56eadcfee735dc78039967c306a4b20 (diff)
downloadopenttd-db3d226c526acbffb321ed71e4b05a0a202ea6e0.tar.xz
(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
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile20
1 files changed, 0 insertions, 20 deletions
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