|
Line
Link Here
|
| 0 |
-- extern/SConscript |
0 |
++ extern/SConscript |
|
Lines 2-9
Link Here
|
| 2 |
|
2 |
|
| 3 |
Import('env') |
3 |
Import('env') |
| 4 |
|
4 |
|
| 5 |
SConscript(['glew/SConscript']) |
|
|
| 6 |
|
| 7 |
if env['WITH_BF_BULLET']: |
5 |
if env['WITH_BF_BULLET']: |
| 8 |
SConscript(['bullet2/src/SConscript']) |
6 |
SConscript(['bullet2/src/SConscript']) |
| 9 |
|
7 |
|
| 10 |
-- config/linux2-config.py |
8 |
++ config/linux2-config.py |
|
Lines 147-153
Link Here
|
| 147 |
WITH_BF_STATICOPENGL = False |
147 |
WITH_BF_STATICOPENGL = False |
| 148 |
BF_OPENGL = '/usr' |
148 |
BF_OPENGL = '/usr' |
| 149 |
BF_OPENGL_INC = '${BF_OPENGL}/include' |
149 |
BF_OPENGL_INC = '${BF_OPENGL}/include' |
| 150 |
BF_OPENGL_LIB = 'GL GLU X11 Xi' |
150 |
BF_OPENGL_LIB = 'GL GLU X11 Xi GLEW' |
| 151 |
BF_OPENGL_LIBPATH = '/usr/X11R6/lib' |
151 |
BF_OPENGL_LIBPATH = '/usr/X11R6/lib' |
| 152 |
BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a' |
152 |
BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a' |
| 153 |
|
153 |
|
|
Lines 170-176
Link Here
|
| 170 |
##ARFLAGSQUIET = ru |
170 |
##ARFLAGSQUIET = ru |
| 171 |
## |
171 |
## |
| 172 |
C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement'] |
172 |
C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement'] |
| 173 |
CC_WARN = ['-Wall'] |
173 |
#CC_WARN = ['-Wall'] |
| 174 |
CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare'] |
174 |
CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare'] |
| 175 |
|
175 |
|
| 176 |
|
176 |
|
| 177 |
-- source/blender/editors/include/BIF_gl.h |
177 |
++ source/blender/editors/include/BIF_gl.h |
|
Lines 31-37
Link Here
|
| 31 |
#ifndef BIF_GL_H |
31 |
#ifndef BIF_GL_H |
| 32 |
#define BIF_GL_H |
32 |
#define BIF_GL_H |
| 33 |
|
33 |
|
| 34 |
#include "../../../../extern/glew/include/GL/glew.h" |
34 |
#include <GL/glew.h> |
| 35 |
|
35 |
|
| 36 |
/* |
36 |
/* |
| 37 |
* these should be phased out. cpack should be replaced in |
37 |
* these should be phased out. cpack should be replaced in |
