diff options
| author | bjarni <bjarni@openttd.org> | 2005-12-10 11:16:45 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2005-12-10 11:16:45 +0000 |
| commit | 6a6e1450106f9944f74021edcd9aec54b3cc11ab (patch) | |
| tree | b00faf47a1ca2028f095a2c406983e4e94fd533e /makefiledir | |
| parent | f1877b3fe9b03f34fdfa5aa7ef3cfd205e08ab29 (diff) | |
| download | openttd-6a6e1450106f9944f74021edcd9aec54b3cc11ab.tar.xz | |
(svn r3281) -Feature: [OSX] added native cocoa sound and video drivers (egladil)
you can still use SDL drivers if you like and you have to run "make upgradeconf" to start using the cocoa drivers (or manually write WITH_COCOA:=1)
since SDL breaks the cocoa drivers, you can't compile with both SDL and cocoa support
Using cocoa drivers makes it easier to make universal binaries and it solves:
-FS#18 [OSX] SDL is weird in universal binaries
-FS#2 [OSX] lazy pointer crash on exit
-FS#10 [OSX] linking error when linking statically to SDL 1.2.8 (needless to explain this, but it means it should be able to compile statically with the default settings now)
-[ 1215073 ] Switching to large size out of fullscreen crashes
Using SDL drivers will still have those issues though
Diffstat (limited to 'makefiledir')
| -rw-r--r-- | makefiledir/Makefile.config_writer | 1 | ||||
| -rw-r--r-- | makefiledir/Makefile.libdetection | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer index 4b56391b6..dff31a4e8 100644 --- a/makefiledir/Makefile.config_writer +++ b/makefiledir/Makefile.config_writer @@ -72,6 +72,7 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,WITH_SDL:=$(WITH_SDL)) $(call CONFIG_LINE,WITH_PNG:=$(WITH_PNG)) $(call CONFIG_LINE,STATIC_ZLIB_PATH:=$(STATIC_ZLIB_PATH)) + $(call CONFIG_LINE,WITH_COCOA:=$(WITH_COCOA)) $(call CONFIG_LINE,) $(call CONFIG_LINE,\# Lib paths for OSX. Read os/MacOSX/Makefile for more info) diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection index 9177061ee..f648c22bd 100644 --- a/makefiledir/Makefile.libdetection +++ b/makefiledir/Makefile.libdetection @@ -93,6 +93,14 @@ endif endif endif +ifdef OSX +# we prefer to use cocoa drivers rather than SDL drivers +# if you really want SDL drivers, you can always modify Makefile.config +WITH_COCOA:=1 +WITH_SDL:= +endif + + # workaround # cygwin have problems with libpng, so we will just disable it for now until the problem is solved ifdef CYGWIN |