diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-25 20:51:16 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-25 20:51:16 +0300 |
| commit | 55d2a56d6020a5d286d5d44f7d2d8a8d0bc9bf58 (patch) | |
| tree | 959cb7abcf1ab92caa28fa5a5156520f08f9936d /source/blender/gpu | |
| parent | 077edbb384e3845f27cc06618046a08c7101cc4c (diff) | |
| parent | f1fa79a59554cb36ebee0a569a7b0f442fef6646 (diff) | |
Sculpt:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24483:24889
Diffstat (limited to 'source/blender/gpu')
| -rw-r--r-- | source/blender/gpu/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/gpu/SConscript | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 279596e5ad7..b6e523fca70 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -30,5 +30,7 @@ SET(INC . ../blenlib ../blenkernel ../makesdna ../include ../../../extern/glew/include ../../../intern/guardedalloc ../../../intern/smoke/extern ../imbuf) +ADD_DEFINITIONS(-DGLEW_STATIC) + BLENDERLIB(bf_gpu "${SRC}" "${INC}") diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript index 7e700c177e4..98f57f336ab 100644 --- a/source/blender/gpu/SConscript +++ b/source/blender/gpu/SConscript @@ -3,9 +3,11 @@ Import ('env') sources = env.Glob('intern/*.c') +defs = [ 'GLEW_STATIC' ] + incs = '../blenlib ../blenkernel ../makesdna ../include' incs += ' #/extern/glew/include #intern/guardedalloc #intern/smoke/extern ../imbuf .' incs += ' ' + env['BF_OPENGL_INC'] -env.BlenderLib ( 'bf_gpu', sources, Split(incs), [], libtype=['core','player'], priority=[160,110] ) +env.BlenderLib ( 'bf_gpu', sources, Split(incs), defines = defs, libtype=['core','player'], priority=[160,110] ) |