diff options
Diffstat (limited to 'source/blender/blenlib/SConscript')
| -rw-r--r-- | source/blender/blenlib/SConscript | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 9d81ac05472..01a9a1eab0e 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -7,20 +7,23 @@ cflags='' incs = '. ../makesdna ../blenkernel #/intern/guardedalloc ../editors/include' incs += ' ' + env['BF_FREETYPE_INC'] incs += ' ' + env['BF_ZLIB_INC'] -incs += ' ' + env['BF_SDL_INC'] defs = '' -if env['WITH_BF_INTERNATIONAL'] == 1: - defs = 'WITH_FREETYPE2' +if env['WITH_BF_SDL']: + incs += ' ' + env['BF_SDL_INC'] + +if env['WITH_BF_INTERNATIONAL']: + defs = 'WITH_FREETYPE2' if env['WITH_BF_VERSE']: defs += ' WITH_VERSE' incs += ' ' + env['BF_VERSE_INCLUDE'] if env['OURPLATFORM'] == 'linux2': - cflags='-pthread' + cflags='-pthread' + incs += ' ../../../extern/binreloc/include' if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): - incs += ' ' + env['BF_PTHREADS_INC'] + incs += ' ' + env['BF_PTHREADS_INC'] -env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [100,195], compileflags =cflags ) +env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core', 'intern', 'player'], priority = [85,150,195], compileflags =cflags ) |