From 1f470ab1b4f1a0f88f9489cb0dd0818496366c8c Mon Sep 17 00:00:00 2001 From: Ken Hughes Date: Mon, 8 Mar 2010 20:32:17 +0000 Subject: scons build systems ------------------- Allows static libs to be passed correctly to the linker (i.e., full paths to libs which end in ".a" are passed to linker without processing). I've been using this on linux release builds since sometime around 2.49 without problem but hesitated to commit since I don't know if it would affect any other platforms. If you're using static libs on another platform and it breaks, let me know. --- SConstruct | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 7e432bf7dfa..ae2c92ef218 100644 --- a/SConstruct +++ b/SConstruct @@ -335,19 +335,17 @@ if not quickie and do_clean: else: # remove file print "remove file %s"%(B.root_build_dir+entry) os.remove(B.root_build_dir+entry) - for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak', - 'extern/xvidcore/build/generic/platform.inc', 'extern/ffmpeg/include']: - if os.path.exists(confile): - print "clean file %s"%confile - if os.path.isdir(confile): - for root, dirs, files in os.walk(confile): - for name in files: - os.remove(os.path.join(root, name)) - else: - os.remove(confile) - print B.bc.OKGREEN+'...done'+B.bc.ENDC - else: - print B.bc.HEADER+'Already Clean, nothing to do.'+B.bc.ENDC + for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak', + 'extern/xvidcore/build/generic/platform.inc', 'extern/ffmpeg/include']: + if os.path.exists(confile): + print "clean file %s"%confile + if os.path.isdir(confile): + for root, dirs, files in os.walk(confile): + for name in files: + os.remove(os.path.join(root, name)) + else: + os.remove(confile) + print B.bc.OKGREEN+'...done'+B.bc.ENDC Exit() if not os.path.isdir ( B.root_build_dir): @@ -402,7 +400,7 @@ thestatlibs, thelibincs = B.setup_staticlibs(env) thesyslibs = B.setup_syslibs(env) if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']: - env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist, [], thestatlibs + thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender') + env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender') if env['WITH_BF_PLAYER']: playerlist = B.create_blender_liblist(env, 'player') playerlist += B.create_blender_liblist(env, 'intern') -- cgit v1.2.3