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/gameengine | |
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/gameengine')
-rw-r--r-- | source/gameengine/BlenderRoutines/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/gameengine/BlenderRoutines/SConscript | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/SConscript | 2 | ||||
-rw-r--r-- | source/gameengine/Rasterizer/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript | 4 | ||||
-rw-r--r-- | source/gameengine/Rasterizer/SConscript | 2 |
8 files changed, 14 insertions, 4 deletions
diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt index f2d6528d797..625ad006e0c 100644 --- a/source/gameengine/BlenderRoutines/CMakeLists.txt +++ b/source/gameengine/BlenderRoutines/CMakeLists.txt @@ -37,6 +37,8 @@ SET(INC ../../../extern/glew/include ) +ADD_DEFINITIONS(-DGLEW_STATIC) + IF(WITH_FFMPEG) ADD_DEFINITIONS(-DWITH_FFMPEG) ENDIF(WITH_FFMPEG) diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript index f076612e231..e5b263ad930 100644 --- a/source/gameengine/BlenderRoutines/SConscript +++ b/source/gameengine/BlenderRoutines/SConscript @@ -2,7 +2,7 @@ Import ('env') sources = env.Glob('*.cpp') -defs = [] +defs = [ 'GLEW_STATIC' ] incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc' incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index 857be4bd827..98a13c5bd48 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -61,6 +61,8 @@ SET(INC ../../../extern/glew/include ) +ADD_DEFINITIONS(-DGLEW_STATIC) + IF(WITH_SDL) SET(INC ${INC} ${SDL_INCLUDE_DIR}) ELSE(WITH_SDL) diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 69d146776db..86afa930d09 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -4,7 +4,7 @@ import sys Import ('env') sources = env.Glob('*.cpp') -defs = [] +defs = [ 'GLEW_STATIC' ] incs = '. #source/blender/python/generic' # Only for Mathutils! and bpy_internal_import.h, be very careful diff --git a/source/gameengine/Rasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/CMakeLists.txt index 51d1f5001dd..0ae17af7634 100644 --- a/source/gameengine/Rasterizer/CMakeLists.txt +++ b/source/gameengine/Rasterizer/CMakeLists.txt @@ -38,5 +38,7 @@ SET(INC ${PYTHON_INC} ) +ADD_DEFINITIONS(-DGLEW_STATIC) + BLENDERLIB(bf_rasterizer "${SRC}" "${INC}") #env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), [], libtype=['game','player'], priority=[35,115], compileflags = cflags ) diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt index f2b97bedb2f..e86f4cd1eb8 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt @@ -41,5 +41,7 @@ SET(INC ../../../../source/blender/blenloader ) +ADD_DEFINITIONS(-DGLEW_STATIC) + BLENDERLIB(bf_oglrasterizer "${SRC}" "${INC}") #env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['game','player'], priority=[40, 120] ) diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript index fb4c685f8d3..68e6789c05e 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript @@ -3,9 +3,11 @@ Import ('env') sources = env.Glob('*.cpp') +defs = [ 'GLEW_STATIC' ] + incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Rasterizer #source/gameengine/BlenderRoutines ' incs += ' #source/blender/gpu #extern/glew/include ' + env['BF_OPENGL_INC'] incs += ' #source/blender/gameengine/Ketsji #source/gameengine/SceneGraph #source/blender/makesdna #source/blender/blenkernel' incs += ' #intern/guardedalloc #source/blender/blenlib' -env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), [], libtype=['core','player'], priority=[350,75], cxx_compileflags=env['BGE_CXXFLAGS']) +env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), defines = defs, libtype=['core','player'], priority=[350,75], cxx_compileflags=env['BGE_CXXFLAGS']) diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript index ea99fa966d8..4bcc0f72588 100644 --- a/source/gameengine/Rasterizer/SConscript +++ b/source/gameengine/Rasterizer/SConscript @@ -6,7 +6,7 @@ sources = env.Glob('*.cpp') incs = '. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/BlenderRoutines #extern/glew/include #source/gameengine/Expressions #source/gameengine/SceneGraph #source/blender/blenkernel #source/blender/makesdna' -defs = [] +defs = [ 'GLEW_STATIC' ] if env['WITH_BF_PYTHON']: incs += ' ' + env['BF_PYTHON_INC'] |