Ghost Context Refactor
https://developer.blender.org/D643 Separates graphics context creation from window code in Ghost so that they can vary separately.
This commit is contained in:
@@ -42,6 +42,7 @@ set(INC
|
||||
../../blender/python/generic
|
||||
../../../intern/container
|
||||
../../../intern/ffmpeg
|
||||
../../../intern/glew-mx
|
||||
../../../intern/guardedalloc
|
||||
../../../intern/string
|
||||
)
|
||||
@@ -51,7 +52,7 @@ set(INC_SYS
|
||||
${GLEW_INCLUDE_PATH}
|
||||
)
|
||||
|
||||
add_definitions(-DGLEW_STATIC)
|
||||
add_definitions(${GL_DEFINITIONS})
|
||||
|
||||
set(SRC
|
||||
Exception.cpp
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
extern "C" {
|
||||
#include "bgl.h"
|
||||
}
|
||||
#include "GL/glew.h"
|
||||
#include "glew-mx.h"
|
||||
|
||||
#include <vector>
|
||||
#include <string.h>
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
#include <math.h>
|
||||
|
||||
|
||||
#include "GL/glew.h"
|
||||
#include "glew-mx.h"
|
||||
|
||||
#include "KX_PythonInit.h"
|
||||
#include "DNA_scene_types.h"
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
#include "PyObjectPlus.h"
|
||||
#include <structmember.h>
|
||||
|
||||
#include "GL/glew.h"
|
||||
#include "glew-mx.h"
|
||||
|
||||
#include "KX_PythonInit.h"
|
||||
#include "RAS_ICanvas.h"
|
||||
|
||||
@@ -37,7 +37,8 @@ incs = [
|
||||
'#intern/ffmpeg',
|
||||
'#intern/guardedalloc',
|
||||
'#intern/string',
|
||||
'#extern/glew/include',
|
||||
env['BF_GLEW_INC'],
|
||||
'#/intern/glew-mx',
|
||||
'#intern/moto/include',
|
||||
'#source/blender/blenkernel',
|
||||
'#source/blender/blenlib',
|
||||
@@ -57,7 +58,8 @@ incs = [
|
||||
]
|
||||
incs = ' '.join(incs)
|
||||
|
||||
defs = ['GLEW_STATIC']
|
||||
defs = env['BF_GL_DEFINITIONS']
|
||||
|
||||
if env['OURPLATFORM'] in ('win32-vc', 'win64-vc','win32-mingw', 'win64-mingw'):
|
||||
if env['BF_DEBUG']:
|
||||
defs.append('_DEBUG')
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
#include "Exception.h"
|
||||
|
||||
#include <memory.h>
|
||||
#include "GL/glew.h"
|
||||
#include "glew-mx.h"
|
||||
|
||||
|
||||
// macro for exception handling and logging
|
||||
|
||||
Reference in New Issue
Block a user