diff options
31 files changed, 20 insertions, 174 deletions
diff --git a/SConstruct b/SConstruct index 68170ef9c5b..49c5ae98249 100644 --- a/SConstruct +++ b/SConstruct @@ -413,18 +413,11 @@ thesyslibs = B.setup_syslibs(env) if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']: env.BlenderProg(B.root_build_dir, "blender", mainlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender') if env['WITH_BF_PLAYER']: -<<<<<<< .working - playerlist = B.create_blender_liblist(env, 'player') - playerlist += B.create_blender_liblist(env, 'intern') - playerlist += B.create_blender_liblist(env, 'extern') - env.BlenderProg(B.root_build_dir, "blenderplayer", playerlist, thestatlibs + dobj + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer') -======= playerlist = B.create_blender_liblist(env, 'player') playerlist += B.create_blender_liblist(env, 'player2') playerlist += B.create_blender_liblist(env, 'intern') playerlist += B.create_blender_liblist(env, 'extern') env.BlenderProg(B.root_build_dir, "blenderplayer", playerlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer') ->>>>>>> .merge-right.r35190 ##### Now define some targets @@ -622,19 +615,11 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'): else: dllsources.append('${BF_SDL_LIBPATH}/SDL.dll') -<<<<<<< .working - if env['WITH_BF_PYTHON']: - if env['BF_DEBUG'] and not env["BF_NO_PYDEBUG"]: - dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}_d.dll') - else: - dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}.dll') -======= if env['WITH_BF_PYTHON']: if env['BF_DEBUG']: dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}_d.dll') else: dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}.dll') ->>>>>>> .merge-right.r35190 if env['WITH_BF_ICONV']: if env['OURPLATFORM'] == 'win64-vc': diff --git a/intern/decimation/SConscript b/intern/decimation/SConscript index 3d0cb0b2db7..46405da2491 100644 --- a/intern/decimation/SConscript +++ b/intern/decimation/SConscript @@ -5,8 +5,5 @@ sources = env.Glob('intern/*.cpp') incs = '. ../moto/include ../container ../memutil' -<<<<<<< .working -env.BlenderLib ('bf_intern_decimate', sources, Split(incs) , [], libtype=['core'], priority = [200] ) -======= env.BlenderLib ('bf_intern_decimate', sources, Split(incs) , [], libtype=['core', 'player'], priority = [200, 100] ) ->>>>>>> .merge-right.r35190 + diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript index 53b2ef775e5..d5f41285faa 100644 --- a/intern/guardedalloc/SConscript +++ b/intern/guardedalloc/SConscript @@ -12,8 +12,5 @@ if env['WITH_BF_CXX_GUARDEDALLOC']: incs = '.' -<<<<<<< .working -env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defines=[], libtype=['intern','player'], priority = [5,150] ) -======= env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defs, libtype=['intern','player'], priority = [5,150] ) ->>>>>>> .merge-right.r35190 + diff --git a/intern/string/SConscript b/intern/string/SConscript index f4f44d89403..7e84f3264db 100644 --- a/intern/string/SConscript +++ b/intern/string/SConscript @@ -4,9 +4,6 @@ Import ('env') sources = env.Glob('intern/*.cpp') incs = '.' -<<<<<<< .working -env.BlenderLib ('bf_intern_string', sources, Split(incs), [], libtype=['intern','player'], priority = [50,10] ) -======= defs = [] if env['WITH_BF_CXX_GUARDEDALLOC']: @@ -14,4 +11,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']: incs += ' #intern/guardedalloc' env.BlenderLib ('bf_intern_string', sources, Split(incs), defs, libtype=['intern','player'], priority = [50,10] ) ->>>>>>> .merge-right.r35190 + diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index b84c6866192..c8172439167 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -9,11 +9,7 @@ incs += ' ../windowmanager ../bmesh #/extern/glew/include' incs += ' ' + env['BF_FREETYPE_INC'] incs += ' ' + env['BF_ZLIB_INC'] -<<<<<<< .working -defs = 'GLEW_STATIC' -======= defs = [] ->>>>>>> .merge-right.r35190 if env['WITH_BF_BINRELOC']: cflags='-pthread' diff --git a/source/blender/editors/animation/SConscript b/source/blender/editors/animation/SConscript index 17f8d32ccf1..3e5133c1174 100644 --- a/source/blender/editors/animation/SConscript +++ b/source/blender/editors/animation/SConscript @@ -4,11 +4,6 @@ Import ('env') sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' -<<<<<<< .working -incs += ' ../../windowmanager ../../bmesh' -incs += ' #/intern/guardedalloc #/extern/glew/include' -======= -incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader' ->>>>>>> .merge-right.r35190 +incs += ' ../../bmesh ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader' env.BlenderLib ( 'bf_editors_animation', sources, Split(incs), [], libtype=['core'], priority=[125] ) diff --git a/source/blender/editors/curve/SConscript b/source/blender/editors/curve/SConscript index 721b269edf3..95dd7fc6233 100644 --- a/source/blender/editors/curve/SConscript +++ b/source/blender/editors/curve/SConscript @@ -5,11 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -<<<<<<< .working -incs += ' ../../gpu ../../bmesh' -======= -incs += ' ../../gpu ../../blenloader' ->>>>>>> .merge-right.r35190 +incs += ' ../../bmesh ../../gpu ../../blenloader' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' env.BlenderLib ( 'bf_editors_curve', sources, Split(incs), [], libtype=['core'], priority=[45] ) diff --git a/source/blender/editors/gpencil/SConscript b/source/blender/editors/gpencil/SConscript index e75e3f032c1..6c23e77208a 100644 --- a/source/blender/editors/gpencil/SConscript +++ b/source/blender/editors/gpencil/SConscript @@ -5,11 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -<<<<<<< .working -incs += ' ../../gpu ../../bmesh' -======= -incs += ' ../../gpu ../../blenloader' ->>>>>>> .merge-right.r35190 +incs += ' ../../gpu ../../blenloader ../../bmesh' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' env.BlenderLib ( 'bf_editors_gpencil', sources, Split(incs), [], libtype=['core'], priority=[45] ) diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript index e3b730e85c1..54390baadb9 100644 --- a/source/blender/editors/interface/SConscript +++ b/source/blender/editors/interface/SConscript @@ -7,13 +7,8 @@ for source in env.Glob('*_api.c'): 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 += ' #/extern/glew/include ../../blenloader ../../bmesh' incs += ' ../../python/' # python button eval defs = [] diff --git a/source/blender/editors/physics/SConscript b/source/blender/editors/physics/SConscript index b3425be7d35..dad0e25ca5e 100644 --- a/source/blender/editors/physics/SConscript +++ b/source/blender/editors/physics/SConscript @@ -5,11 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -<<<<<<< .working -incs += ' ../../gpu ../../bmesh' -======= -incs += ' ../../gpu ../../blenloader' ->>>>>>> .merge-right.r35190 +incs += ' ../../gpu ../../blenloader ../../bmesh' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' defs = '' diff --git a/source/blender/editors/sculpt_paint/SConscript b/source/blender/editors/sculpt_paint/SConscript index 6c1fe79d8bc..829a2760d1a 100644 --- a/source/blender/editors/sculpt_paint/SConscript +++ b/source/blender/editors/sculpt_paint/SConscript @@ -8,11 +8,7 @@ defs = [] incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../render/extern/include' -<<<<<<< .working -incs += ' ../../gpu ../../makesrna ../../bmesh' -======= -incs += ' ../../gpu ../../makesrna ../../blenloader' ->>>>>>> .merge-right.r35190 +incs += ' ../../gpu ../../makesrna ../../blenloader ../../bmesh' if env['OURPLATFORM'] == 'linux2': cflags='-pthread' diff --git a/source/blender/editors/space_buttons/SConscript b/source/blender/editors/space_buttons/SConscript index 38a65cadfab..2f90f1dbf31 100644 --- a/source/blender/editors/space_buttons/SConscript +++ b/source/blender/editors/space_buttons/SConscript @@ -5,11 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -<<<<<<< .working -incs += ' ../../makesrna ../../render/extern/include ../../bmesh' -======= -incs += ' ../../makesrna ../../render/extern/include ../../blenloader' ->>>>>>> .merge-right.r35190 +incs += ' ../../bmesh ../../makesrna ../../render/extern/include ../../blenloader' defs = [] diff --git a/source/blender/editors/space_image/SConscript b/source/blender/editors/space_image/SConscript index 7d966025006..47d9102b3bf 100644 --- a/source/blender/editors/space_image/SConscript +++ b/source/blender/editors/space_image/SConscript @@ -5,11 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -<<<<<<< .working -incs += ' ../../render/extern/include ../../makesrna ../../bmesh' -======= -incs += ' ../../render/extern/include ../../makesrna ../../blenloader' ->>>>>>> .merge-right.r35190 +incs += ' ../../bmesh ../../render/extern/include ../../makesrna ../../blenloader' defs = [] diff --git a/source/blender/editors/space_info/SConscript b/source/blender/editors/space_info/SConscript index 18de1a13d9d..746edadccc2 100644 --- a/source/blender/editors/space_info/SConscript +++ b/source/blender/editors/space_info/SConscript @@ -4,11 +4,7 @@ Import ('env') sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf ../../blenfont' -<<<<<<< .working -incs += ' ../../bmesh ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -======= -incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader' ->>>>>>> .merge-right.r35190 +incs += ' ../../bmesh ../../windowmanager #/intern/guardedalloc #/extern/glew/include ../../blenloader' defs = [] diff --git a/source/blender/editors/transform/SConscript b/source/blender/editors/transform/SConscript index 9b59466bbc0..eba73b080f0 100644 --- a/source/blender/editors/transform/SConscript +++ b/source/blender/editors/transform/SConscript @@ -6,10 +6,6 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../render/extern/include' -<<<<<<< .working -incs += ' ../../gpu ../../makesrna ../../bmesh' -======= -incs += ' ../../gpu ../../makesrna ../../blenloader' ->>>>>>> .merge-right.r35190 +incs += ' ../../gpu ../../makesrna ../../blenloader ../../bmesh' env.BlenderLib ( 'bf_editors_transform', sources, Split(incs), [], libtype=['core'], priority=[40] ) diff --git a/source/blender/editors/uvedit/SConscript b/source/blender/editors/uvedit/SConscript index 3e8c3851962..d236b18a8fd 100644 --- a/source/blender/editors/uvedit/SConscript +++ b/source/blender/editors/uvedit/SConscript @@ -5,10 +5,6 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -<<<<<<< .working -incs += ' ../../makesrna #/intern/opennl/extern ../../gpu ../../bmesh' -======= -incs += ' ../../makesrna #/intern/opennl/extern ../../gpu ../../blenloader' ->>>>>>> .merge-right.r35190 +incs += ' ../../bmesh ../../makesrna #/intern/opennl/extern ../../gpu ../../blenloader' env.BlenderLib ( 'bf_editors_uvedit', sources, Split(incs), [], libtype=['core'], priority=[45] ) diff --git a/source/blender/makesdna/intern/SConscript b/source/blender/makesdna/intern/SConscript index 23a71ae104e..4a869143c8e 100644 --- a/source/blender/makesdna/intern/SConscript +++ b/source/blender/makesdna/intern/SConscript @@ -18,11 +18,7 @@ dna = env.Clone() makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc', -<<<<<<< .working - '../../makesdna', '../', '../../bmesh']) -======= - '../../makesdna', '../../blenloader']) ->>>>>>> .merge-right.r35190 + '../../makesdna', '../../blenloader', '../../bmesh']) if env['OURPLATFORM'] == 'linuxcross': USE_WINE = True # when cross compiling on linux 64bit this is useful diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 2abed91ec02..998acc3c228 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -147,11 +147,6 @@ rna.Depends (generated_files, makesrna) # this seems bad, how to retrieve it from scons? build_dir = root_build_dir + os.sep +'source' + os.sep + 'blender' + os.sep + 'makesrna' + os.sep + 'intern' + os.sep -<<<<<<< .working - -======= - ->>>>>>> .merge-right.r35190 if env['OURPLATFORM'] != 'linuxcross': if env['OURPLATFORM'] in ('win32-vc', 'win64-vc', 'win32-mingw'): rna.Command (generated_files, '', "\"" + root_build_dir+os.sep+"makesrna.exe\" \"" + build_dir ) diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index c4196222ec8..d2f6580b593 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -5,11 +5,7 @@ sources = env.Glob('intern/*.c') incs = '. ./intern' incs += ' #/intern/guardedalloc #/intern/decimation/extern #/intern/bsp/extern #/intern/elbeem/extern' -<<<<<<< .working -incs += ' ../render/extern/include ../bmesh' -======= -incs += ' ../render/extern/include ../blenloader' ->>>>>>> .merge-right.r35190 +incs += ' ../render/extern/include ../blenloader ../bmesh' incs += ' ../include ../blenlib ../makesdna ../blenkernel ../blenkernel/intern' incs += ' ' + env['BF_ZLIB_INC'] diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript index d471025c7da..03819f034eb 100644 --- a/source/blender/render/SConscript +++ b/source/blender/render/SConscript @@ -6,11 +6,7 @@ raysources = env.Glob('intern/raytrace/*.cpp') incs = 'intern/include #/intern/guardedalloc ../blenlib ../makesdna ../makesrna' incs += ' extern/include ../blenkernel ../radiosity/extern/include ../imbuf' -<<<<<<< .working -incs += ' ../include ../blenloader ../../../intern/smoke/extern ../bmesh' -======= -incs += ' ../include ../blenloader ../../../intern/smoke/extern ../../../intern/mikktspace' ->>>>>>> .merge-right.r35190 +incs += ' ../include ../blenloader ../../../intern/smoke/extern ../../../intern/mikktspace ../bmesh' cflags_raytrace = env['CCFLAGS'] cxxflags_raytrace = env['CXXFLAGS'] diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript index f30cea9cb07..ff70ad3bf7b 100644 --- a/source/gameengine/BlenderRoutines/SConscript +++ b/source/gameengine/BlenderRoutines/SConscript @@ -26,14 +26,8 @@ if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') if env['WITH_BF_PYTHON']: -<<<<<<< .working - incs += ' ' + env['BF_PYTHON_INC'] -else: - defs.append('DISABLE_PYTHON') -======= incs += ' ' + env['BF_PYTHON_INC'] defs.append('WITH_PYTHON') ->>>>>>> .merge-right.r35190 if env['WITH_BF_CXX_GUARDEDALLOC']: defs.append('WITH_CXX_GUARDEDALLOC') diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index 78e0f3db01b..9d88018d805 100644 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -28,14 +28,8 @@ if env['BF_DEBUG']: defs.append('_DEBUG') if env['WITH_BF_PYTHON']: -<<<<<<< .working - incs += ' ' + env['BF_PYTHON_INC'] -else: - defs.append('DISABLE_PYTHON') -======= incs += ' ' + env['BF_PYTHON_INC'] defs.append('WITH_PYTHON') ->>>>>>> .merge-right.r35190 if env['WITH_BF_CXX_GUARDEDALLOC']: defs.append('WITH_CXX_GUARDEDALLOC') diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript index 201b0da9d2e..b1e34aa358b 100644 --- a/source/gameengine/Expressions/SConscript +++ b/source/gameengine/Expressions/SConscript @@ -8,14 +8,8 @@ incs ='. #source/kernel/gen_system #intern/guardedalloc #intern/string #intern/m defs = [] if env['WITH_BF_PYTHON']: -<<<<<<< .working - incs += ' ' + env['BF_PYTHON_INC'] -else: - defs.append('DISABLE_PYTHON') -======= incs += ' ' + env['BF_PYTHON_INC'] defs.append('WITH_PYTHON') ->>>>>>> .merge-right.r35190 if env['WITH_BF_CXX_GUARDEDALLOC']: defs.append('WITH_CXX_GUARDEDALLOC') diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript index d5fd90cd79d..a8d3ee65f4c 100644 --- a/source/gameengine/GameLogic/SConscript +++ b/source/gameengine/GameLogic/SConscript @@ -15,14 +15,8 @@ else: defs.append('DISABLE_SDL') if env['WITH_BF_PYTHON']: -<<<<<<< .working - incs += ' ' + env['BF_PYTHON_INC'] -else: - defs.append('DISABLE_PYTHON') -======= incs += ' ' + env['BF_PYTHON_INC'] defs.append('WITH_PYTHON') ->>>>>>> .merge-right.r35190 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): if env['BF_DEBUG']: diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript index 082e413822d..f7a423f4588 100644 --- a/source/gameengine/GamePlayer/common/SConscript +++ b/source/gameengine/GamePlayer/common/SConscript @@ -48,14 +48,8 @@ incs = ['.', defs = [ 'GLEW_STATIC' ] if env['WITH_BF_PYTHON']: -<<<<<<< .working - incs += Split(env['BF_PYTHON_INC']) -else: - defs.append('DISABLE_PYTHON') -======= incs += Split(env['BF_PYTHON_INC']) defs.append('WITH_PYTHON') ->>>>>>> .merge-right.r35190 incs += Split(env['BF_PNG_INC']) incs += Split(env['BF_ZLIB_INC']) diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript index 0ff19a9b621..7c8f1c6f4f0 100644 --- a/source/gameengine/GamePlayer/ghost/SConscript +++ b/source/gameengine/GamePlayer/ghost/SConscript @@ -44,14 +44,8 @@ incs = ['.', defs = [ 'GLEW_STATIC' ] if env['WITH_BF_PYTHON']: -<<<<<<< .working - incs += Split(env['BF_PYTHON_INC']) -else: - defs.append('DISABLE_PYTHON') -======= incs += Split(env['BF_PYTHON_INC']) defs.append('WITH_PYTHON') ->>>>>>> .merge-right.r35190 if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') diff --git a/source/gameengine/Ketsji/KXNetwork/SConscript b/source/gameengine/Ketsji/KXNetwork/SConscript index b916530ac8b..8ad1949bbc4 100644 --- a/source/gameengine/Ketsji/KXNetwork/SConscript +++ b/source/gameengine/Ketsji/KXNetwork/SConscript @@ -10,13 +10,8 @@ incs += ' #source/gameengine/Network #source/gameengine/SceneGraph' defs = [] if env['WITH_BF_PYTHON']: -<<<<<<< .working - incs += ' ' + env['BF_PYTHON_INC'] -else: - defs.append('DISABLE_PYTHON') -======= incs += ' ' + env['BF_PYTHON_INC'] defs.append('WITH_PYTHON') ->>>>>>> .merge-right.r35190 + env.BlenderLib ( 'bf_network', Split(sources), Split(incs), defines=defs,libtype=['core','player'], priority=[400,125], cxx_compileflags=env['BGE_CXXFLAGS']) diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 461c434ea4e..980d42d5d1f 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -29,14 +29,9 @@ else: defs.append('DISABLE_SDL') if env['WITH_BF_PYTHON']: -<<<<<<< .working - incs += ' ' + env['BF_PYTHON_INC'] -else: - defs.append('DISABLE_PYTHON') -======= incs += ' ' + env['BF_PYTHON_INC'] defs.append('WITH_PYTHON') ->>>>>>> .merge-right.r35190 + if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') diff --git a/source/gameengine/Physics/Bullet/SConscript b/source/gameengine/Physics/Bullet/SConscript index e00b2d21ffa..f8f0f8afaea 100644 --- a/source/gameengine/Physics/Bullet/SConscript +++ b/source/gameengine/Physics/Bullet/SConscript @@ -23,14 +23,8 @@ incs += ' ' + env['BF_BULLET_INC'] defs = [] if env['WITH_BF_PYTHON']: -<<<<<<< .working - incs += ' ' + env['BF_PYTHON_INC'] -else: - defs.append('DISABLE_PYTHON') -======= incs += ' ' + env['BF_PYTHON_INC'] defs.append('WITH_PYTHON') ->>>>>>> .merge-right.r35190 if env['WITH_BF_CXX_GUARDEDALLOC']: defs.append('WITH_CXX_GUARDEDALLOC') diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript index d6de7591d45..4eda01a04b6 100644 --- a/source/gameengine/Rasterizer/SConscript +++ b/source/gameengine/Rasterizer/SConscript @@ -9,14 +9,9 @@ incs = '. #intern/guardedalloc #source/kernel/gen_system #intern/string #intern/ defs = [ 'GLEW_STATIC' ] if env['WITH_BF_PYTHON']: -<<<<<<< .working - incs += ' ' + env['BF_PYTHON_INC'] -else: - defs.append('DISABLE_PYTHON') -======= incs += ' ' + env['BF_PYTHON_INC'] defs.append('WITH_PYTHON') ->>>>>>> .merge-right.r35190 + if env['WITH_BF_CXX_GUARDEDALLOC']: defs.append('WITH_CXX_GUARDEDALLOC') diff --git a/source/gameengine/VideoTexture/SConscript b/source/gameengine/VideoTexture/SConscript index 94209f85823..2cd143d2deb 100644 --- a/source/gameengine/VideoTexture/SConscript +++ b/source/gameengine/VideoTexture/SConscript @@ -20,14 +20,8 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc','win32-mingw'): defs.append('_DEBUG') if env['WITH_BF_PYTHON']: -<<<<<<< .working - incs += ' ' + env['BF_PYTHON_INC'] -else: - defs.append('DISABLE_PYTHON') -======= incs += ' ' + env['BF_PYTHON_INC'] defs.append('WITH_PYTHON') ->>>>>>> .merge-right.r35190 if env['WITH_BF_FFMPEG']: defs.append('WITH_FFMPEG') |