diff options
| author | bjarni <bjarni@openttd.org> | 2005-12-06 09:27:42 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2005-12-06 09:27:42 +0000 |
| commit | 1a93bcb5bb0bf733ad74d8e192478e9e4643ca7a (patch) | |
| tree | 4ba3970f99ec1415b93974ea8cedfa94d3bbc470 /Makefile | |
| parent | 414481cdd8732223fea40a9efd5e30463e7521a1 (diff) | |
| download | openttd-1a93bcb5bb0bf733ad74d8e192478e9e4643ca7a.tar.xz | |
(svn r3262) -Fix: [OSX] universal binaries can now include the dynamic SDL lib into the bundle
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 13 insertions, 0 deletions
@@ -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 |