diff options
| author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-10-08 00:46:19 +0400 |
|---|---|---|
| committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-10-08 00:47:32 +0400 |
| commit | 8d084e8c8f48dd2f07d4a3fbd4a941a7bcc0dcfb (patch) | |
| tree | 5bf15f4f74f3e5a307cfa3f734b2cd086dca69bd /source/blender/windowmanager/SConscript | |
| parent | a8705e99ee8ec9de2f25c3bac1e9895c2f98c224 (diff) | |
Ghost Context Refactor
https://developer.blender.org/D643
Separates graphics context creation from window code in Ghost so that they can vary separately.
Diffstat (limited to 'source/blender/windowmanager/SConscript')
| -rw-r--r-- | source/blender/windowmanager/SConscript | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 00d363e1539..b93192d5067 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -36,7 +36,8 @@ incs = [ '#/intern/guardedalloc', '#/intern/memutil', '#/source/gameengine/BlenderRoutines', - '#/extern/glew/include', + env['BF_GLEW_INC'], + '#/intern/glew-mx', '../blenfont', '../blenkernel', '../blenlib', @@ -54,7 +55,7 @@ incs = [ ] incs = ' '.join(incs) -defs = [ 'GLEW_STATIC' ] +defs = env['BF_GL_DEFINITIONS'] if env['WITH_BF_PYTHON']: defs.append('WITH_PYTHON') @@ -78,4 +79,7 @@ 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") + env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defines=defs, libtype=['core'], priority=[5] ) |