From ca254dd37b5dd2c52a88d952569a20026fcae6cb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 5 Apr 2011 23:31:01 +0000 Subject: add option WITH_BUILTIN_GLEW, so linux packagers can disable to use their own glew library. --- source/blender/blenfont/CMakeLists.txt | 2 +- source/blender/blenkernel/CMakeLists.txt | 2 +- source/blender/editors/include/BIF_gl.h | 2 +- source/blender/editors/render/CMakeLists.txt | 2 +- source/blender/gpu/CMakeLists.txt | 2 +- source/blender/makesrna/SConscript | 1 + source/blender/makesrna/intern/CMakeLists.txt | 2 +- source/blender/makesrna/intern/SConscript | 1 + source/blender/nodes/CMakeLists.txt | 2 +- source/blender/python/generic/CMakeLists.txt | 2 +- source/blender/windowmanager/CMakeLists.txt | 2 +- 11 files changed, 11 insertions(+), 9 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index 4f211bdda17..15fbfaa2de2 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -29,7 +29,7 @@ set(INC ../editors/include ../blenkernel ../../../intern/guardedalloc - ../../../extern/glew/include + ${GLEW_INCLUDE_PATH} ${FREETYPE_INCLUDE_DIRS} ) diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index c8969f86778..aaa596862c5 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -38,7 +38,6 @@ set(INC ../nodes ../editors/include ../render/extern/include - ../../../extern/glew/include ../../../intern/audaspace/intern ../../../intern/bsp/extern ../blenfont ../../../intern/decimation/extern @@ -50,6 +49,7 @@ set(INC ../../../intern/smoke/extern ../../../intern/mikktspace ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h + ${GLEW_INCLUDE_PATH} ${ZLIB_INCLUDE_DIRS} ) diff --git a/source/blender/editors/include/BIF_gl.h b/source/blender/editors/include/BIF_gl.h index 85244a85613..873b4e52a20 100644 --- a/source/blender/editors/include/BIF_gl.h +++ b/source/blender/editors/include/BIF_gl.h @@ -35,7 +35,7 @@ #ifndef BIF_GL_H #define BIF_GL_H -#include "../../../../extern/glew/include/GL/glew.h" +#include "GL/glew.h" /* * these should be phased out. cpack should be replaced in diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index 3e3d42e9454..16cfca8dadb 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -32,7 +32,7 @@ set(INC ../../render/extern/include ../../windowmanager ../../../../intern/guardedalloc - ../../../../extern/glew/include + ${GLEW_INCLUDE_PATH} ) set(SRC diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index c79206a5641..fc7e3408683 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -32,9 +32,9 @@ set(INC ../imbuf ../makesdna ../makesrna - ../../../extern/glew/include ../../../intern/guardedalloc ../../../intern/smoke/extern + ${GLEW_INCLUDE_PATH} ) set(SRC diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index e89003a60c2..86ba81aae58 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -9,6 +9,7 @@ objs += o incs = '#/intern/guardedalloc #/intern/memutil #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .' incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin ../blenfont ../blenloader' incs += ' ../render/extern/include' +incs += ' #/extern/glew/include' defs = [] diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 70490e48add..9f44c0acad3 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -144,10 +144,10 @@ blender_include_dirs( ../../windowmanager ../../editors/include ../../render/extern/include - ../../../../extern/glew/include ../../../../intern/audaspace/intern ../../../../intern/guardedalloc ../../../../intern/memutil + ${GLEW_INCLUDE_PATH} ) add_executable(makesrna ${SRC} ${SRC_RNA_INC} ${SRC_DNA_INC}) diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 5a20a2257a8..c48b479da16 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -34,6 +34,7 @@ incs += ' ../../imbuf ../../makesdna ../../makesrna ../../ikplugin' incs += ' ../../windowmanager ../../editors/include ../../blenfont' incs += ' ../../render/extern/include' incs += ' #/intern/audaspace/intern ' +incs += ' #/extern/glew/include ' if env['WITH_BF_OPENEXR']: defs.append('WITH_OPENEXR') diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 09a627b51d4..efd5523f5b2 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -34,7 +34,7 @@ set(INC ../makesrna ../render/extern/include ../../../intern/guardedalloc - ../../../extern/glew/include + ${GLEW_INCLUDE_PATH} ) set(SRC diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index 0ea478adbf6..5e4eae4f809 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -25,7 +25,7 @@ set(INC ../../blenkernel ../../blenloader ../../../../intern/guardedalloc - ../../../../extern/glew/include + ${GLEW_INCLUDE_PATH} ${PYTHON_INCLUDE_DIRS} ) diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index 2be62d5a8b2..db0815efa53 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -43,8 +43,8 @@ set(INC ../../../intern/elbeem/extern ../../../intern/ghost ../../../intern/opennl/extern - ../../../extern/glew/include ${OPENGL_INCLUDE_DIR} + ${GLEW_INCLUDE_PATH} ) set(SRC -- cgit v1.2.3