diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-11-05 02:04:15 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-11-05 02:04:15 +0300 |
commit | beea73b110a7b3ad983a09c7e41b503cee590ebd (patch) | |
tree | d7fcd15db02d97e9c2a665fd8ecc0e99b734bfb9 /extern/libopenjpeg | |
parent | 2d802627596ba51a2ff7ff56f28c0c14aee559ad (diff) |
* enable openjpeg building for win32/msvc
* add support for building redcode on win32/msvc, but disabled for now, as there are linking problems
- I cleaned the redcode sconscript - the copying of headers within the source tree is not a clean solution
This needs to be fixed later on. For now, lets use redcode from extern/ until a better way is found.
Diffstat (limited to 'extern/libopenjpeg')
-rw-r--r-- | extern/libopenjpeg/SConscript | 14 |
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) |