griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

patch [#19796] GLEW update by Mitchell Stokes (Moguri)

Browse Source 
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)
This commit is contained in:
Dalai Felinto
2009-11-21 20:36:03 +00:00
parent 75e82b5349
commit d875f4927e
22 changed files with 6115 additions and 645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/CMakeLists.txt
View File

@@ -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)

2
source/blender/blenkernel/SConscript
View File

@@ -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')

2
source/blender/editors/CMakeLists.txt
View File

@@ -43,6 +43,8 @@ SET(INC ../windowmanager
../ikplugin
)
ADD_DEFINITIONS(-DGLEW_STATIC)
IF(WITH_GAMEENGINE)
ADD_DEFINITIONS(-DGAMEBLENDER)
ENDIF(WITH_GAMEENGINE)

2
source/blender/editors/space_view3d/SConscript
View File

@@ -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'

2
source/blender/gpu/CMakeLists.txt
View File

@@ -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}")

4
source/blender/gpu/SConscript
View File

@@ -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] )

2
source/blender/windowmanager/CMakeLists.txt
View File

@@ -43,6 +43,8 @@ SET(INC .
${OPENGL_INCLUDE_DIR}
)
ADD_DEFINITIONS(-DGLEW_STATIC)
IF(WITH_INTERNATIONAL)
ADD_DEFINITIONS(-DINTERNATIONAL)
ENDIF(WITH_INTERNATIONAL)

2
source/blender/windowmanager/SConscript
View File

@@ -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')

2
source/gameengine/BlenderRoutines/CMakeLists.txt
View File

@@ -37,6 +37,8 @@ SET(INC
../../../extern/glew/include
)
ADD_DEFINITIONS(-DGLEW_STATIC)
IF(WITH_FFMPEG)
ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG)

2
source/gameengine/BlenderRoutines/SConscript
View File

@@ -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'

2
source/gameengine/Ketsji/CMakeLists.txt
View File

@@ -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)

2
source/gameengine/Ketsji/SConscript
View File

@@ -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

2
source/gameengine/Rasterizer/CMakeLists.txt
View File

@@ -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 )

2
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
View File

@@ -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] )

4
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
View File

@@ -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'])

2
source/gameengine/Rasterizer/SConscript
View File

@@ -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']