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:
Diffstat (limited to 'extern/libopenjpeg')
-rw-r--r--extern/libopenjpeg/SConscript14
1 files changed, 9 insertions, 5 deletions
diff --git a/extern/libopenjpeg/SConscript b/extern/libopenjpeg/SConscript
index f0a93f6e2d9..7100ecb37fd 100644
--- a/extern/libopenjpeg/SConscript
+++ b/extern/libopenjpeg/SConscript
@@ -7,14 +7,18 @@ Import('env')
sources = env.Glob('*.c')
incs = '.'
-flags = "-Wall -O3 -ffast-math -std=c99"
+if env['OURPLATFORM'] == 'win32-vc':
+ flags = []
+else:
+ flags = ['-Wall', '-O3', '-ffast-math', '-std=c99']
-oj_env = env.Copy();
-oj_env.Replace(CCFLAGS = '')
-oj_env.Replace(BF_DEBUG_FLAGS = '')
+oj_env = env.Clone()
+if not env['OURPLATFORM'] == 'win32-vc':
+ oj_env.Replace(CCFLAGS = '')
+ oj_env.Replace(BF_DEBUG_FLAGS = '')
oj_env.BlenderLib ( libname='extern_openjpeg',
sources=sources, includes=Split(incs),
defines=[],
libtype=['core','intern','player'],
- priority=[10, 10, 300], compileflags = Split(flags))
+ priority=[5, 10, 200], compileflags = flags)