diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-06-06 03:27:49 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-06-06 03:27:49 +0400 |
| commit | 2ebb1c63f7b26478ed4c85d572312adf562b3148 (patch) | |
| tree | 1765ff232652cc9eda3b2df3157db0ca2033b1c8 /source/blender/editors/screen/SConscript | |
| parent | 4da179749eb8d6b53f5c2eba4b3e4132656c3d4f (diff) | |
finish cleanup to cmake editors, also removed some stuff from scons thats not needed.
Diffstat (limited to 'source/blender/editors/screen/SConscript')
| -rw-r--r-- | source/blender/editors/screen/SConscript | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript index 703a16f753b..6efb2617a18 100644 --- a/source/blender/editors/screen/SConscript +++ b/source/blender/editors/screen/SConscript @@ -4,17 +4,12 @@ Import ('env') sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../blenfont ../../makesdna ../../imbuf' -incs += ' ../../blenloader ../../windowmanager ../../python ../../makesrna ../../gpu' +incs += ' ../../blenloader ../../windowmanager ../../makesrna ../../gpu' incs += ' ../../render/extern/include' incs += ' #/intern/guardedalloc #/extern/glew/include' defs = '' -if not env['WITH_BF_PYTHON']: - defs += 'DISABLE_PYTHON' -if env['WITH_BF_OPENEXR']: - defs += ' WITH_OPENEXR' - if env['OURPLATFORM'] == 'linux2': cflags='-pthread' incs += ' ../../../extern/binreloc/include' @@ -22,8 +17,4 @@ if env['OURPLATFORM'] == 'linux2': if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] -if env['OURPLATFORM'] == 'darwin': - if env['WITH_BF_OPENMP']: - defs += ' PARALLEL=1' - env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), Split(defs), libtype=['core'], priority=[105] ) |