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/gpu | |
| 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/gpu')
| -rw-r--r-- | source/blender/gpu/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/gpu/SConscript | 4 |
2 files changed, 5 insertions, 1 deletions
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] ) |