--- file_not_specified_in_diff +++ file_not_specified_in_diff @@ -, +, @@ --- extern/SConscript +++ extern/SConscript @@ -2,8 +2,6 @@ Import('env') -SConscript(['glew/SConscript']) - if env['WITH_BF_BULLET']: SConscript(['bullet2/src/SConscript']) --- config/linux2-config.py +++ config/linux2-config.py @@ -147,7 +147,7 @@ WITH_BF_STATICOPENGL = False BF_OPENGL = '/usr' BF_OPENGL_INC = '${BF_OPENGL}/include' -BF_OPENGL_LIB = 'GL GLU X11 Xi' +BF_OPENGL_LIB = 'GL GLU X11 Xi GLEW' BF_OPENGL_LIBPATH = '/usr/X11R6/lib' 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' @@ -170,7 +170,7 @@ ##ARFLAGSQUIET = ru ## C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement'] -CC_WARN = ['-Wall'] +#CC_WARN = ['-Wall'] CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare'] --- source/blender/editors/include/BIF_gl.h +++ source/blender/editors/include/BIF_gl.h @@ -31,7 +31,7 @@ #ifndef BIF_GL_H #define BIF_GL_H -#include "../../../../extern/glew/include/GL/glew.h" +#include /* * these should be phased out. cpack should be replaced in