diff options
Diffstat (limited to 'source/blender/windowmanager/SConscript')
| -rw-r--r-- | source/blender/windowmanager/SConscript | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 00d363e1539..ec1b265d800 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -36,11 +36,13 @@ incs = [ '#/intern/guardedalloc', '#/intern/memutil', '#/source/gameengine/BlenderRoutines', - '#/extern/glew/include', + env['BF_GLEW_INC'], + '#/intern/glew-mx', '../blenfont', '../blenkernel', '../blenlib', '../blenloader', + '../blentranslation', '../compositor', '../editors/include', '../gpu', @@ -54,7 +56,8 @@ incs = [ ] incs = ' '.join(incs) -defs = [ 'GLEW_STATIC' ] +defs = [] +defs += env['BF_GL_DEFINITIONS'] if env['WITH_BF_PYTHON']: defs.append('WITH_PYTHON') @@ -64,11 +67,18 @@ if env['WITH_BF_COLLADA']: if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'): incs += ' ' + env['BF_PTHREADS_INC'] - incs += ' ../../intern/utfconv' if env['BF_BUILDINFO']: defs.append('WITH_BUILDINFO') +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'): + if env['WITH_BF_IME']: + defs.append('WITH_INPUT_IME') + +if env['WITH_BF_AUDASPACE']: + defs += env['BF_AUDASPACE_DEF'] + incs += ' ' + env['BF_AUDASPACE_C_INC'] + if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') @@ -78,4 +88,11 @@ if env['WITH_BF_COMPOSITOR']: if env['WITH_BF_PYTHON_SECURITY']: defs.append("WITH_PYTHON_SECURITY") +if env['OURPLATFORM'] in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'aix4', 'aix5'): + defs.append("WITH_X11") + +if env['WITH_BF_OPENSUBDIV']: + defs.append("WITH_OPENSUBDIV") + incs += ' #intern/opensubdiv' + env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defines=defs, libtype=['core'], priority=[5] ) |