projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6f1d0b0
)
separate host and target (OSX)
author
Robin Gareus
<robin@gareus.org>
Sun, 19 Oct 2014 19:26:17 +0000
(21:26 +0200)
committer
Robin Gareus
<robin@gareus.org>
Sun, 19 Oct 2014 21:13:50 +0000
(23:13 +0200)
wscript
patch
|
blob
|
history
diff --git
a/wscript
b/wscript
index 1e8368e142a42fdb83b25502c13462a129813542..84792f461a9e12558241e2de3796b17953e683dd 100644
(file)
--- a/
wscript
+++ b/
wscript
@@
-165,6
+165,15
@@
def set_compiler_flags (conf,opt):
if opt.gprofile:
debug_flags = [ '-pg' ]
if opt.gprofile:
debug_flags = [ '-pg' ]
+ # OSX
+ if platform == 'darwin':
+ if re.search ("^13[.]", version) != None:
+ conf.env['build_host'] = 'mavericks'
+ elif re.search ("^14[.]", version) != None:
+ conf.env['build_host'] = 'yosemite'
+ else:
+ conf.env['build_host'] = 'irrelevant'
+
# Autodetect
if opt.dist_target == 'auto':
if platform == 'darwin':
# Autodetect
if opt.dist_target == 'auto':
if platform == 'darwin':
@@
-181,8
+190,10
@@
def set_compiler_flags (conf,opt):
conf.env['build_target'] = 'lion'
elif re.search ("^12[.]", version) != None:
conf.env['build_target'] = 'mountainlion'
conf.env['build_target'] = 'lion'
elif re.search ("^12[.]", version) != None:
conf.env['build_target'] = 'mountainlion'
+ elif re.search ("^13[.]", version) != None:
+ conf.env['build_target'] = 'mavericks'
else:
else:
- conf.env['build_target'] = '
mavericks' # 13.0.0
+ conf.env['build_target'] = '
yosemite'
else:
match = re.search(
"(?P<cpu>i[0-6]86|x86_64|powerpc|ppc|ppc64|arm|s390x?)",
else:
match = re.search(
"(?P<cpu>i[0-6]86|x86_64|powerpc|ppc|ppc64|arm|s390x?)",
@@
-203,7
+214,7
@@
def set_compiler_flags (conf,opt):
#
compiler_flags.append ('-U__STRICT_ANSI__')
#
compiler_flags.append ('-U__STRICT_ANSI__')
- if conf.options.cxx11 or conf.env['build_
target'] == 'mavericks'
:
+ if conf.options.cxx11 or conf.env['build_
host'] in [ 'mavericks', 'yosemite' ]
:
conf.check_cxx(cxxflags=["-std=c++11"])
cxx_flags.append('-std=c++11')
if platform == "darwin":
conf.check_cxx(cxxflags=["-std=c++11"])
cxx_flags.append('-std=c++11')
if platform == "darwin":
@@
-288,8
+299,7
@@
def set_compiler_flags (conf,opt):
# a single way to test if we're on OS X
#
# a single way to test if we're on OS X
#
- if conf.env['build_target'] in ['panther', 'tiger', 'leopard', 'snowleopard' ]:
- conf.define ('IS_OSX', 1)
+ if conf.env['build_target'] in ['panther', 'tiger', 'leopard' ]:
# force tiger or later, to avoid issues on PPC which defaults
# back to 10.1 if we don't tell it otherwise.
# force tiger or later, to avoid issues on PPC which defaults
# back to 10.1 if we don't tell it otherwise.
@@
-297,17
+307,20
@@
def set_compiler_flags (conf,opt):
("-DMAC_OS_X_VERSION_MIN_REQUIRED=1040",
'-mmacosx-version-min=10.4'))
("-DMAC_OS_X_VERSION_MIN_REQUIRED=1040",
'-mmacosx-version-min=10.4'))
+ elif conf.env['build_target'] in [ 'snowleopard' ]:
+ compiler_flags.extend(
+ ("-DMAC_OS_X_VERSION_MIN_REQUIRED=1060",
+ '-mmacosx-version-min=10.6'))
+
elif conf.env['build_target'] in [ 'lion', 'mountainlion' ]:
compiler_flags.extend(
("-DMAC_OS_X_VERSION_MIN_REQUIRED=1070",
'-mmacosx-version-min=10.7'))
elif conf.env['build_target'] in [ 'lion', 'mountainlion' ]:
compiler_flags.extend(
("-DMAC_OS_X_VERSION_MIN_REQUIRED=1070",
'-mmacosx-version-min=10.7'))
- elif conf.env['build_target'] in [ 'mavericks' ]:
+ elif conf.env['build_target'] in [ 'mavericks'
, 'yosemite'
]:
compiler_flags.extend(
("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
"-mmacosx-version-min=10.8"))
compiler_flags.extend(
("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
"-mmacosx-version-min=10.8"))
- else:
- conf.define ('IS_OSX', 0)
#
# save off CPU element in an env
#
# save off CPU element in an env