From d875f4927e430e1dfdee40ba66465efd3286b013 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Sat, 21 Nov 2009 20:36:03 +0000 Subject: 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) --- source/blender/blenkernel/CMakeLists.txt | 2 ++ source/blender/blenkernel/SConscript | 2 +- source/blender/editors/CMakeLists.txt | 2 ++ source/blender/editors/space_view3d/SConscript | 2 +- source/blender/gpu/CMakeLists.txt | 2 ++ source/blender/gpu/SConscript | 4 +++- source/blender/windowmanager/CMakeLists.txt | 2 ++ source/blender/windowmanager/SConscript | 2 +- source/gameengine/BlenderRoutines/CMakeLists.txt | 2 ++ source/gameengine/BlenderRoutines/SConscript | 2 +- source/gameengine/Ketsji/CMakeLists.txt | 2 ++ source/gameengine/Ketsji/SConscript | 2 +- source/gameengine/Rasterizer/CMakeLists.txt | 2 ++ source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt | 2 ++ source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript | 4 +++- source/gameengine/Rasterizer/SConscript | 2 +- 16 files changed, 28 insertions(+), 8 deletions(-) (limited to 'source') 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') 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'] -- cgit v1.2.3