diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-01-24 21:09:03 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-01-24 21:09:03 +0300 |
commit | ca5fe954f4f26972ad4ff7a07417df7253ad7f6f (patch) | |
tree | 0a546548bee46bff2d2bc35b29931cc08919e262 /extern/libopenjpeg/SConscript | |
parent | 10e39a23311d392e916b02ed9f551d8eee214047 (diff) |
* make sure openjpeg stuff compiles and links properly.
- since we use this only as statically linked, I took out
some confusing #ifdefs.
Diffstat (limited to 'extern/libopenjpeg/SConscript')
-rw-r--r-- | extern/libopenjpeg/SConscript | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/extern/libopenjpeg/SConscript b/extern/libopenjpeg/SConscript index 837701eeae0..eb408c1e9c0 100644 --- a/extern/libopenjpeg/SConscript +++ b/extern/libopenjpeg/SConscript @@ -6,9 +6,12 @@ Import('env') sources = env.Glob('*.c') incs = '.' +flags = [] +defs = [] if env['OURPLATFORM'] == 'win32-vc': flags = [] + defs.append('OPJ_STATIC') else: flags = ['-Wall', '-O3', '-ffast-math', '-std=c99'] @@ -19,6 +22,6 @@ if not env['OURPLATFORM'] == 'win32-vc': oj_env.BlenderLib ( libname='extern_openjpeg', sources=sources, includes=Split(incs), - defines=[], + defines=defs, libtype=['core','intern','player'], - priority=[10, 10, 300], compileflags = flags) + priority=[300, 300, 300], compileflags = flags) |