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
path: root/extern
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 /extern
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 'extern')
-rw-r--r--extern/libopenjpeg/SConscript2
1 files changed, 2 insertions, 0 deletions
diff --git a/extern/libopenjpeg/SConscript b/extern/libopenjpeg/SConscript
index f5c1f4f48ba..178875ddec3 100644
--- a/extern/libopenjpeg/SConscript
+++ b/extern/libopenjpeg/SConscript
@@ -13,6 +13,8 @@ defs = []
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
flags = []
defs.append('OPJ_STATIC')
+elif env['OURPLATFORM'] == 'darwin':
+ flags = ['-Wall', '-O3', '-ffast-math', '-std=c99'] + env['CCFLAGS'] # to supply SDK_FLAGS here
else:
flags = ['-Wall', '-O3', '-ffast-math', '-std=c99']