summaryrefslogtreecommitdiff
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
commit1cfabfbb09ebf105c8f6f37fe09badfb1f8b915d (patch)
tree1255a001e325f00cd2fed755e3af0a2853e756e7
parent015db8a461c7d78956bcf67cb0b36b2b27e02588 (diff)
downloadopenttd-1cfabfbb09ebf105c8f6f37fe09badfb1f8b915d.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
-rw-r--r--Makefile20
-rw-r--r--makefiledir/Makefile.config_writer7
-rw-r--r--os/macosx/Makefile4
-rw-r--r--os/macosx/Makefile.setup16
4 files changed, 0 insertions, 47 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
diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer
index 9bb44882b..7d5430326 100644
--- a/makefiledir/Makefile.config_writer
+++ b/makefiledir/Makefile.config_writer
@@ -72,13 +72,6 @@ $(MAKE_CONFIG):
$(call CONFIG_LINE,WITH_COCOA:=$(WITH_COCOA))
$(call CONFIG_LINE,)
- $(call CONFIG_LINE,\# Lib paths for OSX. Read os/MacOSX/Makefile for more info)
- $(call CONFIG_LINE,OSX_LIB_PATH:=$(OSX_LIB_PATH))
- $(call CONFIG_LINE,OSX_LOCAL_LIB_PATH:=$(OSX_LOCAL_LIB_PATH))
- $(call CONFIG_LINE,OSX_CHANGE_LIB_PATH:=$(OSX_CHANGE_LIB_PATH))
- $(call CONFIG_LINE,x86_SDL_LIB:=$(x86_SDL_LIB))
- $(call CONFIG_LINE,)
-
$(call CONFIG_LINE,\# OS flags)
$(call CONFIG_LINE,WIN32:=$(WIN32))
$(call CONFIG_LINE,UNIX:=$(UNIX))
diff --git a/os/macosx/Makefile b/os/macosx/Makefile
index 3ea875843..93de65acd 100644
--- a/os/macosx/Makefile
+++ b/os/macosx/Makefile
@@ -4,7 +4,6 @@
ifdef FAT_BINARY
FAT_BINARY:=build_universal_binary
-COPY_x86_SDL_LIB:=$(Q)cp $(x86_SDL_LIB) $(OSXAPP)/Contents/lib/libSDL-x86.dylib
endif
ifdef UNIVERSAL_x86_PART
@@ -24,7 +23,6 @@ $(FAT_BINARY): $(TTD)
$(Q)cp $(TTD) temp_binary_dir/$(TTD)_a
$(Q)rm -rf $(TTD) $(OBJS) # delete all .o files so we can compile for a new endian
$(Q)make UNIVERSAL_x86_PART:=1
- $(Q)install_name_tool -change $(x86_SDL_LIB) @executable_path/../lib/libSDL-x86.dylib $(TTD)
$(Q)cp $(TTD) temp_binary_dir/$(TTD)_b
@echo '===> Joining the PPC and x86 binaries into one universal one'
$(Q)lipo temp_binary_dir/$(TTD)_a temp_binary_dir/$(TTD)_b -create -output $(TTD)
@@ -40,7 +38,6 @@ $(BUILD_OSX_BUNDLE): $(TTD) $(FAT_BINARY)
$(Q)mkdir -p "$(OSXAPP)"/Contents/Resources
$(Q)mkdir -p "$(OSXAPP)"/Contents/Data
$(Q)mkdir -p "$(OSXAPP)"/Contents/Lang
- $(Q)mkdir -p "$(OSXAPP)"/Contents/lib
$(Q)echo "APPL????" > "$(OSXAPP)"/Contents/PkgInfo
$(Q)cp os/macosx/openttd.icns "$(OSXAPP)"/Contents/Resources/openttd.icns
$(Q)os/macosx/plistgen.sh "$(OSXAPP)" "$(REV)"
@@ -48,7 +45,6 @@ $(BUILD_OSX_BUNDLE): $(TTD) $(FAT_BINARY)
$(Q)cp os/macosx/splash.png "$(OSXAPP)"/Contents/Data/
$(Q)cp lang/*.lng "$(OSXAPP)"/Contents/Lang/
$(Q)cp $(TTD) "$(OSXAPP)"/Contents/MacOS/$(TTD)
- $(COPY_x86_SDL_LIB)
# make the release disk image. Should only be used with releases and is a good and fast way to make sure to remember all the needed files
release: all
diff --git a/os/macosx/Makefile.setup b/os/macosx/Makefile.setup
index befa231c5..c2531815f 100644
--- a/os/macosx/Makefile.setup
+++ b/os/macosx/Makefile.setup
@@ -89,22 +89,6 @@ $(error no PPC libpng found)
$(error no x86 libpng found)
endif
endif
-
- ifdef WITH_SDL
- ifdef STATIC
- ifndef x86_SDL_LIB
-$(error static universal build without a defined x86 SDL lib)
- endif
- endif
- TEST:=$(shell lipo -info `$(SDL_PPC_CONFIG) --prefix`/lib/libSDL.a | xargs -n 1 | grep "ppc"))
- ifndef TEST
-$(error no PPC SDL lib found)
- endif
- TEST:=$(shell lipo -info `$(SDL_x86_CONFIG) --prefix`/lib/libSDL.a | xargs -n 1 | grep "i386"))
- ifndef TEST
-$(error no x86 SDL lib found)
- endif
- endif
endif
ifdef UNIVERSAL_x86_PART