diff options
author | rubidium <rubidium@openttd.org> | 2009-07-14 17:16:32 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2009-07-14 17:16:32 +0000 |
commit | 6f0d8acf552d13114783a495fb9860432234e43d (patch) | |
tree | 121dd77def960eda3e4c095b11f3ca0bbb842638 /config.lib | |
parent | e3c7a77b4066f00f3248e390184da874bd20d7ee (diff) | |
download | openttd-6f0d8acf552d13114783a495fb9860432234e43d.tar.xz |
(svn r16828) -Codechange: attempt at making OSX compile with the 10.6 SDK too; no guarantees ofcourse...
Diffstat (limited to 'config.lib')
-rw-r--r-- | config.lib | 45 |
1 files changed, 41 insertions, 4 deletions
diff --git a/config.lib b/config.lib index 54bac073b..a72025098 100644 --- a/config.lib +++ b/config.lib @@ -2019,16 +2019,53 @@ detect_cocoa() { log 1 "checking whether to enable the Quartz window subdriver... no" fi + detect_quickdraw +} + +detect_quickdraw() { + # 0 means no, 1 is auto-detect, 2 is force + # 64 bits doesn't have quickdraw if [ "$cpu_type" = "64" ]; then enable_cocoa_quickdraw="0" + log 1 "checking Quickdraw window subdriver... disabled (64 bits)" + return 0 fi - if [ "$enable_cocoa_quickdraw" != "0" ]; then - log 1 "checking whether to enable the Quickdraw window subdriver... yes" - else - log 1 "checking whether to enable the Quickdraw window subdriver... no" + if [ "$enable_cocoa_quickdraw" = "0" ]; then + log 1 "checking Quickdraw window subdriver... disabled" + + return 0 + fi + +cat > tmp.osx.mm << EOF +#define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_3 +#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3 +#include <AvailabilityMacros.h> +#import <Cocoa/Cocoa.h> +int main(int argc, char *argv[]) { return 0; } +EOF + execute="$cxx_host $CFLAGS tmp.osx.mm -framework Cocoa -o tmp.osx 2>&1" + eval $execute > /dev/null + ret=$? + log 2 "executing $execute" + log 2 " exit code $ret" + rm -f tmp.osx.mm tmp.osx + if [ "$ret" != "0" ]; then + log 1 "checking Quickdraw window subdriver... not found" + + # It was forced, so it should be found. + if [ "$enable_cocoa_quickdraw" != "1" ]; then + log 1 "configure: error: Quickdraw window driver could not be found" + exit 1 + fi + + enable_cocoa_quickdraw=0 + return 0 fi + + enable_cocoa_quickdraw=1 + log 1 "checking Quickdraw window subdriver... found" } detect_library() { |