summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2005-10-25 19:41:32 +0000
committerbjarni <bjarni@openttd.org>2005-10-25 19:41:32 +0000
commit477aa9f69c7de801fcab952cb7ddc7af36f7f89d (patch)
tree9baa193bbebc46746bcf90dd0c9d1458e321621b
parent66e688cba3e42d80419ce7224f14ed3505644290 (diff)
downloadopenttd-477aa9f69c7de801fcab952cb7ddc7af36f7f89d.tar.xz
(svn r3088) -Fix: [OSX] fixed issue where OSX could not dynamic link to quicktime [ 1334917 ]
-rw-r--r--Makefile24
1 files changed, 15 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index fe5fef1d3..8a4e3ad4f 100644
--- a/Makefile
+++ b/Makefile
@@ -494,16 +494,22 @@ STRGEN_FLAGS=
endif
-# OSX path setup
+# OSX specific setup
ifdef OSX
-ifndef SECOND_DATA_PATH
-SECOND_DATA_PATH:="$(OSXAPP)/Contents/Data/"
-endif
-ifndef CUSTOM_LANG_DIR
-ifndef DEDICATED
-CUSTOM_LANG_DIR:="$(OSXAPP)/Contents/Lang/"
-endif
-endif
+ ifndef DEDICATED
+ LIBS += -framework QuickTime
+ endif
+
+ # OSX path setup
+ ifndef SECOND_DATA_PATH
+ SECOND_DATA_PATH:="$(OSXAPP)/Contents/Data/"
+ endif
+
+ ifndef CUSTOM_LANG_DIR
+ ifndef DEDICATED
+ CUSTOM_LANG_DIR:="$(OSXAPP)/Contents/Lang/"
+ endif
+ endif
endif
ifdef MIDI