From 7dab0f7e041b223b72ed9cfbe1aa8fe85f20fe61 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 8 Mar 2013 04:28:18 +0000 Subject: get 1040 vs 1070 OS X min requirement working (for lion, at least) git-svn-id: svn://localhost/ardour2/branches/3.0@14185 d708f5d6-7413-0410-9779-e7cbd77b26cf --- wscript | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 0bac1ebfe3..432f344e3f 100644 --- a/wscript +++ b/wscript @@ -290,11 +290,15 @@ def set_compiler_flags (conf,opt): conf.env.append_value('CFLAGS', "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040") conf.env.append_value('CXXFLAGS', "-DMAC_OS_X_VERSION_MIN_REQUIRED=1040") + conf.env.append_value('CXXFLAGS', '-mmacosx-version-min=10.4') + conf.env.append_value('CFLAGS', '-mmacosx-version-min=10.4') + elif conf.env['build_target'] in [ 'lion', 'mountainlion' ]: conf.env.append_value('CFLAGS', "-DMAC_OS_X_VERSION_MIN_REQUIRED=1070") conf.env.append_value('CXXFLAGS', "-DMAC_OS_X_VERSION_MIN_REQUIRED=1070") - + conf.env.append_value('CXXFLAGS', '-mmacosx-version-min=10.7') + conf.env.append_value('CFLAGS', '-mmacosx-version-min=10.7') else: conf.define ('IS_OSX', 0) @@ -548,14 +552,6 @@ def configure(conf): conf.define ('TOP_MENUBAR',1) conf.define ('GTKOSX',1) - # Define OSX as a uselib to use when compiling - # on Darwin to add all applicable flags at once - # - conf.env.append_value('CXXFLAGS_OSX', '-DMAC_OS_X_VERSION_MIN_REQUIRED=1040') - conf.env.append_value('CFLAGS_OSX', '-DMAC_OS_X_VERSION_MIN_REQUIRED=1040') - conf.env.append_value('CXXFLAGS_OSX', '-mmacosx-version-min=10.4') - conf.env.append_value('CFLAGS_OSX', '-mmacosx-version-min=10.4') - # It would be nice to be able to use this to force back-compatibility with 10.4 # but even by the time of 11, the 10.4 SDK is no longer available in any normal # way. -- cgit v1.2.3