diff options
author | Robin Gareus <robin@gareus.org> | 2015-02-25 21:11:55 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2015-02-25 21:11:55 +0100 |
commit | 8ed563336797d6e9d52084ec132f0cd13c8ee342 (patch) | |
tree | 33dea54b38f317eab92b59e7eb29078baeb0460c /wscript | |
parent | da975ae27becb222c283a22365afe017e51f1a19 (diff) |
fix osx version detection in da975ae
Diffstat (limited to 'wscript')
-rw-r--r-- | wscript | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -797,7 +797,12 @@ def configure(conf): conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'AudioToolbox', '-framework', 'AudioUnit']) conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Cocoa']) - if ( re.search ("^[1-9][0-9]\.", os.uname()[2]) == None or os.uname()[2] == "10" ) and (Options.options.generic or Options.options.ppc) and not Options.options.nocarbon: + if ( + # osx up to and including 10.6 (uname 10.X.X) + (re.search ("^[1-9][0-9]\.", os.uname()[2]) == None or not re.search ("^10\.", os.uname()[2]) == None) + and (Options.options.generic or Options.options.ppc) + and not Options.options.nocarbon + ): conf.env.append_value('CXXFLAGS_AUDIOUNITS', "-DWITH_CARBON") conf.env.append_value('LINKFLAGS_AUDIOUNITS', ['-framework', 'Carbon']) else: |