diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:17:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-11 16:22:54 +0400 |
commit | 54ee22130ca0ce59500c6eddb562b78eb4526bcd (patch) | |
tree | ba21cdaa35656c590059c864e028e24b6e234082 /source/blender/editors/space_graph | |
parent | b09f7dcaa7b487ada53c8dbaa811deaa1201d163 (diff) | |
parent | 04814476c08e9350c424619cd99ccb1149d65365 (diff) |
Merge branch 'master' into dyntopo_holesdyntopo_holes
Conflicts:
source/blender/blenkernel/intern/pbvh_bmesh.c
Diffstat (limited to 'source/blender/editors/space_graph')
-rw-r--r-- | source/blender/editors/space_graph/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/space_graph/SConscript | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index d3fb87204fb..0a29810ff3d 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -23,10 +23,12 @@ set(INC ../../blenfont ../../blenkernel ../../blenlib + ../../gpu ../../makesdna ../../makesrna ../../windowmanager ../../../../intern/guardedalloc + ../../../../intern/glew-mx ) set(INC_SYS @@ -56,4 +58,6 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() +add_definitions(${GL_DEFINITIONS}) + blender_add_lib(bf_editor_space_graph "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/editors/space_graph/SConscript b/source/blender/editors/space_graph/SConscript index 8ddeb0ccfe8..35e09749743 100644 --- a/source/blender/editors/space_graph/SConscript +++ b/source/blender/editors/space_graph/SConscript @@ -31,19 +31,21 @@ sources = env.Glob('*.c') incs = [ '#/intern/guardedalloc', - '#/extern/glew/include', + env['BF_GLEW_INC'], + '#/intern/glew-mx', '#/intern/audaspace/intern', '../include', '../../blenfont', '../../blenkernel', '../../blenlib', + '../../gpu', '../../imbuf', '../../makesdna', '../../makesrna', '../../windowmanager', ] -defs = [] +defs = env['BF_GL_DEFINITIONS'] if env['WITH_BF_INTERNATIONAL']: defs.append('WITH_INTERNATIONAL') |