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:
@@ -33,7 +33,8 @@ incs = [
|
||||
'.',
|
||||
'#/intern/guardedalloc',
|
||||
'#/intern/memutil',
|
||||
'#/extern/glew/include',
|
||||
env['BF_GLEW_INC'],
|
||||
'#/intern/glew-mx',
|
||||
'#/intern/audaspace/intern',
|
||||
'#/intern/cycles/blender',
|
||||
'../blenfont',
|
||||
@@ -62,7 +63,7 @@ sources = env.Glob('bmesh/*.c')
|
||||
env.BlenderLib( libname = 'bf_python_bmesh', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [362,165])
|
||||
|
||||
# generic
|
||||
defs = ['GLEW_STATIC']
|
||||
defs = env['BF_GL_DEFINITIONS']
|
||||
|
||||
if is_debug:
|
||||
defs.append('_DEBUG')
|
||||
@@ -79,7 +80,7 @@ env.BlenderLib( libname = 'bf_python_mathutils', sources = Split(sources), inclu
|
||||
|
||||
|
||||
# bpy
|
||||
defs = []
|
||||
defs = env['BF_GL_DEFINITIONS']
|
||||
|
||||
if is_debug:
|
||||
defs.append('_DEBUG')
|
||||
|
||||
@@ -22,8 +22,10 @@ set(INC
|
||||
.
|
||||
../../blenkernel
|
||||
../../blenlib
|
||||
../../gpu
|
||||
../../makesdna
|
||||
../../../../intern/guardedalloc
|
||||
../../../../intern/glew-mx
|
||||
)
|
||||
|
||||
set(INC_SYS
|
||||
@@ -46,6 +48,6 @@ set(SRC
|
||||
py_capi_utils.h
|
||||
)
|
||||
|
||||
add_definitions(-DGLEW_STATIC)
|
||||
add_definitions(${GL_DEFINITIONS})
|
||||
|
||||
blender_add_lib(bf_python_ext "${SRC}" "${INC}" "${INC_SYS}")
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <Python.h>
|
||||
|
||||
#include "bgl.h" /*This must come first */
|
||||
#include <GL/glew.h>
|
||||
#include "GPU_glew.h"
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
#include "BLI_utildefines.h"
|
||||
|
||||
@@ -260,5 +260,6 @@ if(WITH_PLAYER)
|
||||
add_definitions(-DWITH_PLAYER)
|
||||
endif()
|
||||
|
||||
add_definitions(${GL_DEFINITIONS})
|
||||
|
||||
blender_add_lib(bf_python "${SRC}" "${INC}" "${INC_SYS}")
|
||||
|
||||
Reference in New Issue
Block a user