diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2009-11-21 23:36:03 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2009-11-21 23:36:03 +0300 |
commit | d875f4927e430e1dfdee40ba66465efd3286b013 (patch) | |
tree | be783a0174e2ba20d4ae5666c06e9eef5636dc91 /source/blender | |
parent | 75e82b53497944298fb86e884bf8a7a443b961b9 (diff) |
patch [#19796] GLEW update by Mitchell Stokes (Moguri)
GLEW update to version 1.5.1 [11-03-08]
this opens room for Geometry Shader support.
* - Brecht, Campbell told me you did some local changes in order to make it right in Linux. I get to you in order to know what those changes are (or feel free to commit them directly)
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/SConscript | 2 | ||||
-rw-r--r-- | source/blender/editors/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/SConscript | 2 | ||||
-rw-r--r-- | source/blender/gpu/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/gpu/SConscript | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/SConscript | 2 |
8 files changed, 14 insertions, 4 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index f60cade61ed..7bd6314097b 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -37,6 +37,8 @@ SET(INC ${ZLIB_INC} ) +ADD_DEFINITIONS(-DGLEW_STATIC) + IF(WITH_BULLET) SET(INC ${INC} ../../../extern/bullet2/src) ADD_DEFINITIONS(-DUSE_BULLET) diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 63631ddc40f..81b74cc9c42 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -16,7 +16,7 @@ incs += ' #/intern/audaspace/intern' incs += ' ' + env['BF_OPENGL_INC'] incs += ' ' + env['BF_ZLIB_INC'] -defs = [] +defs = [ 'GLEW_STATIC' ] if not env['WITH_BF_PYTHON']: defs.append('DISABLE_PYTHON') diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt index d13d7ce2ff2..04c310ba7df 100644 --- a/source/blender/editors/CMakeLists.txt +++ b/source/blender/editors/CMakeLists.txt @@ -43,6 +43,8 @@ SET(INC ../windowmanager ../ikplugin ) +ADD_DEFINITIONS(-DGLEW_STATIC) + IF(WITH_GAMEENGINE) ADD_DEFINITIONS(-DGAMEBLENDER) ENDIF(WITH_GAMEENGINE) diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript index 057c98a1d49..68e2ccb4e06 100644 --- a/source/blender/editors/space_view3d/SConscript +++ b/source/blender/editors/space_view3d/SConscript @@ -2,7 +2,7 @@ Import ('env') sources = env.Glob('*.c') -defs = [] +defs = [ 'GLEW_STATIC' ] incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' 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] ) diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 7274803128d..e93b9906dac 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -43,6 +43,8 @@ SET(INC . ${OPENGL_INCLUDE_DIR} ) +ADD_DEFINITIONS(-DGLEW_STATIC) + IF(WITH_INTERNATIONAL) ADD_DEFINITIONS(-DINTERNATIONAL) ENDIF(WITH_INTERNATIONAL) diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 2a86d42f590..beae5b721cc 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -14,7 +14,7 @@ incs += ' ../makesrna ../gpu ../blenfont' incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost' incs += ' #/intern/elbeem #/extern/glew/include' -defs = [] +defs = [ 'GLEW_STATIC' ] if not env['WITH_BF_PYTHON']: defs.append('DISABLE_PYTHON') |