From a6b1c0a8ccb54aa75cc5b1d340fa567ccf4af3e7 Mon Sep 17 00:00:00 2001 From: Ken Hughes Date: Sun, 19 Oct 2008 21:25:17 +0000 Subject: Added WITH_BF_NOBLENDER to scons so that blenderplayer can be compiler by itself (false by default). Also added dependency for 'blender' on command line; seems 'blender' was intended to be a target, but would give the error "Do not know how to make target `blender' ". --- SConstruct | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 0a959cc5b7b..e7d4a4e77bd 100644 --- a/SConstruct +++ b/SConstruct @@ -363,7 +363,8 @@ dobj = B.buildinfo(env, "dynamic") + B.resources thestatlibs, thelibincs = B.setup_staticlibs(env) thesyslibs = B.setup_syslibs(env) -env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender') +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') if env['WITH_BF_PLAYER']: playerlist = B.create_blender_liblist(env, 'player') env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer') @@ -534,6 +535,10 @@ nsisaction = env.Action(btools.NSIS_Installer, btools.NSIS_print) nsiscmd = env.Command('nsisinstaller', None, nsisaction) nsisalias = env.Alias('nsis', nsiscmd) +if 'blender' in B.targets: + blenderexe= env.Alias('blender', B.program_list) + Depends(blenderexe,installtarget) + if env['WITH_BF_PLAYER']: blenderplayer = env.Alias('blenderplayer', B.program_list) Depends(blenderplayer,installtarget) -- cgit v1.2.3