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/blenfont/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/blenfont/SConscript')
| -rw-r--r-- | source/blender/blenfont/SConscript | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript index 1c573fa4a59..b6cf052a980 100644 --- a/source/blender/blenfont/SConscript +++ b/source/blender/blenfont/SConscript @@ -35,10 +35,12 @@ incs = [ 'intern', '#/intern/guardedalloc', '#/intern/locale', - '#/extern/glew/include', + env['BF_GLEW_INC'], + '#/intern/glew-mx', '../blenkernel', '../blenlib', '../editors/include', + '../gpu', '../imbuf', '../makesdna', '../makesrna', @@ -47,7 +49,7 @@ incs = [ incs.extend(Split(env['BF_FREETYPE_INC'])) -defs = ['GLEW_STATIC'] +defs = env['BF_GL_DEFINITIONS'] if sys.platform == 'win32' or env['OURPLATFORM'] == 'linuxcross': defs.append('_WIN32') |