Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Verwiebe <info@jensverwiebe.de>2014-07-06 16:10:29 +0400
committerJens Verwiebe <info@jensverwiebe.de>2014-07-06 16:10:41 +0400
commit2440b3e15810401dc06c0e8af82f90f621e7563e (patch)
tree7e0720f963ab6b907236b5c2dad49afa05eaf844 /SConstruct
parent5fefc84783555152c0bb924b3f509c7ec8f1a04d (diff)
OSX/scons: Try to get rid of buildproblems with openjpeg enabled in certain build environments and prepend SDK_FLAGS to CFLAGS always
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct1
1 files changed, 1 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct
index 134970dfdc3..29e7561b7e7 100644
--- a/SConstruct
+++ b/SConstruct
@@ -374,6 +374,7 @@ if env['OURPLATFORM']=='darwin':
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']]+ARCH_FLAGS+env['PLATFORM_LINKFLAGS']
+ env['CFLAGS']=SDK_FLAGS+env['CFLAGS']
env['CCFLAGS']=SDK_FLAGS+env['CCFLAGS']
env['CXXFLAGS']=SDK_FLAGS+env['CXXFLAGS']