Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2009-11-21 23:36:03 +0300
committerDalai Felinto <dfelinto@gmail.com>2009-11-21 23:36:03 +0300
commitd875f4927e430e1dfdee40ba66465efd3286b013 (patch)
treebe783a0174e2ba20d4ae5666c06e9eef5636dc91 /source/gameengine/BlenderRoutines
parent75e82b53497944298fb86e884bf8a7a443b961b9 (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/BlenderRoutines')
-rw-r--r--source/gameengine/BlenderRoutines/CMakeLists.txt2
-rw-r--r--source/gameengine/BlenderRoutines/SConscript2
2 files changed, 3 insertions, 1 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'