Attachment #295983 for bug #394871

Lines 2-8 Link Here

(-)extern/SConscript-original (-1 lines)
2		2
3	Import('env')	3	Import('env')
4		4
5	SConscript(['glew/SConscript'])
6	SConscript(['colamd/SConscript'])	5	SConscript(['colamd/SConscript'])
7		6
8	if env['WITH_BF_GAMEENGINE']:	7	if env['WITH_BF_GAMEENGINE']:

Lines 33-39 Link Here

(-)source/blender/editors/include/BIF_gl.h-original (-1 / +1 lines)
33	#ifndef BIF_GL_H	33	#ifndef BIF_GL_H
34	#define BIF_GL_H	34	#define BIF_GL_H
35		35
36	#include "GL/glew.h"	36	#include <GL/glew.h>
37		37
38	/*	38	/*
39	* these should be phased out. cpack should be replaced in	39	* these should be phased out. cpack should be replaced in

Lines 40-48 Link Here

(-)extern/CMakeLists.txt-original (-3 lines)
40	add_subdirectory(binreloc)	40	add_subdirectory(binreloc)
41	endif()	41	endif()
42		42
43	if(WITH_BUILTIN_GLEW)
44	add_subdirectory(glew)
45	endif()
46		43
47	if(WITH_GAMEENGINE)	44	if(WITH_GAMEENGINE)
48	add_subdirectory(recastnavigation)	45	add_subdirectory(recastnavigation)

Lines 156-162 Link Here

(-)CMakeLists.txt-original (-1 / +1 lines)
156		156
157	if(UNIX AND NOT APPLE)	157	if(UNIX AND NOT APPLE)
158	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)	158	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
159	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)	159	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" OFF)
160	option(WITH_XDG_USER_DIRS "Build with XDG Base Directory Specification (only config and documents for now)" OFF)	160	option(WITH_XDG_USER_DIRS "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
161	mark_as_advanced(WITH_XDG_USER_DIRS)	161	mark_as_advanced(WITH_XDG_USER_DIRS)
162	else()	162	else()

Return to bug 394871