diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
| commit | f01261d040be27337db9f9996d648a279c89b7c4 (patch) | |
| tree | c448230939b3c90d53ce8852dd00925d6052e3a4 /source/blender/editors/space_view3d/SConscript | |
| parent | dcaeda5c4e3a0687251b8511de4f2e8b85ef75c0 (diff) | |
| parent | 2198cfdb2deec8b2e85e242c74a032f43d0b26ca (diff) | |
merge with/from trunk at r35190
Diffstat (limited to 'source/blender/editors/space_view3d/SConscript')
| -rw-r--r-- | source/blender/editors/space_view3d/SConscript | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript index 907afc12020..9c1c03ff373 100644 --- a/source/blender/editors/space_view3d/SConscript +++ b/source/blender/editors/space_view3d/SConscript @@ -6,14 +6,14 @@ defs = [ 'GLEW_STATIC' ] incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' ../../render/extern/include' +incs += ' ../../render/extern/include ../../blenloader' incs += ' ../../gpu ../../makesrna ../../blenfont ../../bmesh' incs += ' #/intern/smoke/extern' incs += ' #source/kernel/gen_system' if env['WITH_BF_GAMEENGINE']: - defs.append('GAMEBLENDER=1') + defs.append('WITH_GAMEENGINE') if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): - incs += ' ' + env['BF_PTHREADS_INC'] + incs += ' ' + env['BF_PTHREADS_INC'] env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), defines = defs, libtype=['core'], priority=[40] ) |