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 | |
| 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')
| -rw-r--r-- | source/blender/blenfont/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/blenfont/SConscript | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index 2debe516dd7..346d5bc64b8 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -26,11 +26,13 @@ set(INC ../blenkernel ../blenlib ../editors/include + ../gpu ../makesdna ../makesrna ../python ../imbuf ../../../intern/guardedalloc + ../../../intern/glew-mx ../../../intern/locale ) @@ -58,7 +60,7 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() -add_definitions(-DGLEW_STATIC) +add_definitions(${GL_DEFINITIONS}) blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}") 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') |