summaryrefslogtreecommitdiff
path: root/wscript
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-03-05 15:21:28 +0000
committerCarl Hetherington <cth@carlh.net>2014-03-05 15:21:28 +0000
commit36764550544103218d3071f4fccf40c10c13a1c6 (patch)
tree990315dce415bfc57e15b4fd6f48758e6b6e4941 /wscript
parent8d012bf6205f54ecb59634376f0e53dd340e34f1 (diff)
Don't use fpmath=sse on OS X as clang does not recognise it.
Diffstat (limited to 'wscript')
-rw-r--r--wscript10
1 files changed, 8 insertions, 2 deletions
diff --git a/wscript b/wscript
index 883de0023..28de19e9c 100644
--- a/wscript
+++ b/wscript
@@ -175,7 +175,7 @@ def configure(conf):
conf.env.INSTALL_PREFIX = conf.options.install_prefix
# Common CXXFLAGS
- conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-D__STDC_LIMIT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing',
+ conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-D__STDC_LIMIT_MACROS', '-msse', '-ffast-math', '-fno-strict-aliasing',
'-Wall', '-Wno-attributes', '-Wextra', '-D_FILE_OFFSET_BITS=64'])
if conf.options.enable_debug:
@@ -193,7 +193,12 @@ def configure(conf):
# Windows
if conf.env.TARGET_WINDOWS:
- conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN'])
+ conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_WINDOWS')
+ conf.env.append_value('CXXFLAGS', '-DWIN32_LEAN_AND_MEAN')
+ conf.env.append_value('CXXFLAGS', '-DBOOST_USE_WINDOWS_H')
+ conf.env.append_value('CXXFLAGS', '-DUNICODE')
+ conf.env.append_value('CXXFLAGS', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN')
+ conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
wxrc = os.popen('wx-config --rescomp').read().split()[1:]
conf.env.append_value('WINRCFLAGS', wxrc)
if conf.options.enable_debug:
@@ -219,6 +224,7 @@ def configure(conf):
# Linux
if conf.env.TARGET_LINUX:
+ conf.env.append_value('CXXFLAGS', '-mfpmath=sse')
conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX')
if conf.env.TARGET_DEBIAN: