From c2153e7419673e5096b196a9b380a4234d464e3e Mon Sep 17 00:00:00 2001
From: bjarni <bjarni@openttd.org>
Date: Tue, 6 Dec 2005 09:27:42 +0000
Subject: (svn r3262) -Fix: [OSX] universal binaries can now include the
 dynamic SDL lib into the bundle

---
 Makefile | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a77f7c1b5..57b7ea827 100644
--- a/Makefile
+++ b/Makefile
@@ -177,6 +177,7 @@ ifdef UNIVERSAL_OTHER_HALF
 	LDFLAGS = $(LDFLAGS_UNI)
 	SDL-CONFIG = $(SDL-CONFIG_UNI)
 	LIBPNG-CONFIG = $(LIBPNG-CONFIG_UNI)
+	LIBS:=
 endif
 
 # this is used if there aren't any Makefile.config
@@ -419,6 +420,15 @@ 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
@@ -430,6 +440,9 @@ LIBS += $(shell $(SDL-CONFIG) --libs)
 endif
 endif
 
+ifdef DYNAMIC_SDL_IN_STATIC
+STATIC:=1
+endif
 
 # zlib config
 ifdef WITH_ZLIB
-- 
cgit v1.2.3-54-g00ecf