blob: edc0c9b624275e197544c1251aeef65eaaee9448 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
--- extern/SConscript
+++ extern/SConscript
@@ -2,8 +2,6 @@
Import('env')
-SConscript(['glew/SConscript'])
-
if env['WITH_BF_GAMEENGINE']:
SConscript(['recastnavigation/SConscript'])
if env['WITH_BF_ELTOPO']:
SConscript(['eltopo/SConscript'])
--- source/blender/editors/include/BIF_gl.h
+++ source/blender/editors/include/BIF_gl.h
@@ -35,7 +35,7 @@
#ifndef BIF_GL_H
#define BIF_GL_H
-#include "GL/glew.h"
+#include <GL/glew.h>
/*
* these should be phased out. cpack should be replaced in
--- extern/CMakeLists.txt
+++ extern/CMakeLists.txt
@@ -39,9 +39,6 @@
add_subdirectory(binreloc)
endif()
-if(WITH_BUILTIN_GLEW)
- add_subdirectory(glew)
-endif()
if(WITH_GAMEENGINE)
add_subdirectory(recastnavigation)
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -150,7 +150,7 @@
if(UNIX AND NOT APPLE)
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support)" ON)
- option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
+ option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" OFF)
else()
# not an option for other OS's
set(WITH_BUILTIN_GLEW ON)
|
GitWeb
