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_logic/SConscript | |
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_logic/SConscript')
-rw-r--r-- | source/blender/editors/space_logic/SConscript | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/space_logic/SConscript b/source/blender/editors/space_logic/SConscript index ae8e929a684..067073fab22 100644 --- a/source/blender/editors/space_logic/SConscript +++ b/source/blender/editors/space_logic/SConscript @@ -31,12 +31,14 @@ sources = env.Glob('*.c') incs = [ '#/intern/guardedalloc', - '#/extern/glew/include', + env['BF_GLEW_INC'], + '#/intern/glew-mx', '../include', '../interface', '../../blenfont', '../../blenkernel', '../../blenlib', + '../../gpu', '../../imbuf', '../../makesdna', '../../makesrna', @@ -44,7 +46,7 @@ incs = [ ] incs = ' '.join(incs) -defs = [] +defs = env['BF_GL_DEFINITIONS'] if env['WITH_BF_GAMEENGINE']: defs.append('WITH_GAMEENGINE') |