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/interface/SConscript | |
| parent | dcaeda5c4e3a0687251b8511de4f2e8b85ef75c0 (diff) | |
| parent | 2198cfdb2deec8b2e85e242c74a032f43d0b26ca (diff) | |
merge with/from trunk at r35190
Diffstat (limited to 'source/blender/editors/interface/SConscript')
| -rw-r--r-- | source/blender/editors/interface/SConscript | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript index 214722e5efb..e3b730e85c1 100644 --- a/source/blender/editors/interface/SConscript +++ b/source/blender/editors/interface/SConscript @@ -4,11 +4,16 @@ Import ('env') sources = env.Glob('*.c') for source in env.Glob('*_api.c'): - sources.remove(source) + sources.remove(source) incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf' +<<<<<<< .working incs += ' ../../makesrna ../../windowmanager ../../gpu ../../bmesh' incs += ' #/intern/guardedalloc #/extern/glew/include' +======= +incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc ../../gpu' +incs += ' #/extern/glew/include ../../blenloader' +>>>>>>> .merge-right.r35190 incs += ' ../../python/' # python button eval defs = [] @@ -16,7 +21,7 @@ defs = [] if env['WITH_BF_INTERNATIONAL']: defs.append('INTERNATIONAL') -if not env['WITH_BF_PYTHON']: - defs.append('DISABLE_PYTHON') - +if env['WITH_BF_PYTHON']: + defs.append('WITH_PYTHON') + env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), defs, libtype=['core'], priority=[110] ) |