diff options
author | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-07 17:56:40 +0400 |
---|---|---|
committer | Jens Verwiebe <info@jensverwiebe.de> | 2013-11-07 17:56:40 +0400 |
commit | 463b65bf0a67389b327e87b9e86122251689a7be (patch) | |
tree | fd1979c777dd2e32af522cee8642143e85850736 | |
parent | a0286f42f91b3001486abb8999911ebac7560491 (diff) |
OSX/scons: ARCH_FLAGS where not prperly added to CPPFLAGS
-rw-r--r-- | SConstruct | 4 | ||||
-rw-r--r-- | build_files/scons/config/darwin-config.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index c4079341df9..c76106a0d26 100644 --- a/SConstruct +++ b/SConstruct @@ -360,8 +360,8 @@ if env['OURPLATFORM']=='darwin': ARCH_FLAGS = ['-m64'] else: ARCH_FLAGS = ['-m32'] - - env['CPPFLAGS'] = list(ARCH_FLAGS) + + env.Append(CPPFLAGS=ARCH_FLAGS) SDK_FLAGS=['-isysroot', env['MACOSX_SDK'],'-mmacosx-version-min='+ env['MACOSX_DEPLOYMENT_TARGET'],'-arch',env['MACOSX_ARCHITECTURE']] # always used env['PLATFORM_LINKFLAGS'] = ['-mmacosx-version-min='+ env['MACOSX_DEPLOYMENT_TARGET'],'-isysroot', env['MACOSX_SDK'],'-arch',env['MACOSX_ARCHITECTURE']]+env['PLATFORM_LINKFLAGS'] diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 0b0120e4473..09dc32f082a 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -230,6 +230,7 @@ BF_QUIET = '1' # suppress verbose output CFLAGS = [] CXXFLAGS = [] CCFLAGS = ['-pipe','-funsigned-char'] +CPPFLAGS = [] PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL'] |