sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

scons fix

Browse Source
This commit is contained in:
Joseph Eagar 2011-03-17 23:30:29 +00:00
parent baaf0d1b68
commit bbbbea6024
31 changed files with 20 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
SConstruct
View File

@ -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':

5
intern/decimation/SConscript
View File

@ -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

5
intern/guardedalloc/SConscript
View File

@ -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

5
intern/string/SConscript
View File

@ -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

4
source/blender/blenlib/SConscript
View File

@ -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'

7
source/blender/editors/animation/SConscript
View File

@ -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] )

6
source/blender/editors/curve/SConscript
View File

@ -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] )

6
source/blender/editors/gpencil/SConscript
View File

@ -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] )

7
source/blender/editors/interface/SConscript
View File

@ -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 = []

6
source/blender/editors/physics/SConscript
View File

@ -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 = ''

6
source/blender/editors/sculpt_paint/SConscript
View File

@ -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'

6
source/blender/editors/space_buttons/SConscript
View File

@ -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 = []

6
source/blender/editors/space_image/SConscript
View File

@ -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 = []

6
source/blender/editors/space_info/SConscript
View File

@ -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 = []

6
source/blender/editors/transform/SConscript
View File

@ -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] )

6
source/blender/editors/uvedit/SConscript
View File

@ -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] )

6
source/blender/makesdna/intern/SConscript
View File

@ -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

5
source/blender/makesrna/intern/SConscript
View File

@ -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 )

6
source/blender/modifiers/SConscript
View File

@ -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']

6
source/blender/render/SConscript
View File

@ -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']

6
source/gameengine/BlenderRoutines/SConscript
View File

@ -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')

6
source/gameengine/Converter/SConscript
View File

@ -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')

6
source/gameengine/Expressions/SConscript
View File

@ -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')

6
source/gameengine/GameLogic/SConscript
View File

@ -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']:

6
source/gameengine/GamePlayer/common/SConscript
View File

@ -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'])

6
source/gameengine/GamePlayer/ghost/SConscript
View File

@ -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')

7
source/gameengine/Ketsji/KXNetwork/SConscript
View File

@ -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'])

7
source/gameengine/Ketsji/SConscript
View File

@ -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')

6
source/gameengine/Physics/Bullet/SConscript
View File

@ -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')

7
source/gameengine/Rasterizer/SConscript
View File

@ -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')

6
source/gameengine/VideoTexture/SConscript
View File

@ -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')