Added WITH_BF_NOBLENDER to scons so that blenderplayer can be compiler by itself...
authorKen Hughes <khughes@pacific.edu>
Sun, 19 Oct 2008 21:25:17 +0000 (21:25 +0000)
committerKen Hughes <khughes@pacific.edu>
Sun, 19 Oct 2008 21:25:17 +0000 (21:25 +0000)
SConstruct
tools/btools.py

index 0a959cc5b7bb4de8314376b55f0a148baf58c182..e7d4a4e77bdbfa86c825e18a9a08c404877918c6 100644 (file)
@@ -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)
index 4c5e0dd3527582e334e018f84b39d40a0453b8a3..04ff9bcd9148fdf103bdbd91fc80b9b68d047af6 100755 (executable)
@@ -52,6 +52,7 @@ def validate_arguments(args, bc):
             'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC', 'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC', 'BF_OPENGL_LINKFLAGS',
             'WITH_BF_FTGL', 'BF_FTGL', 'BF_FTGL_INC', 'BF_FTGL_LIB',
             'WITH_BF_PLAYER',
+            'WITH_BF_NOBLENDER',
             'WITH_BF_BINRELOC',        
             'CFLAGS', 'CCFLAGS', 'CPPFLAGS', 
             'REL_CFLAGS', 'REL_CCFLAGS',
@@ -310,6 +311,7 @@ def read_opts(cfg, args):
         ('BF_FTGL_LIB', 'FTGL libraries', ''),
 
         (BoolOption('WITH_BF_PLAYER', 'Build blenderplayer if true', 'false')),
+        (BoolOption('WITH_BF_NOBLENDER', 'Do not build blender if true', 'false')),
 
         ('CFLAGS', 'C-compiler flags', ''),
         ('CCFLAGS', 'C++-compiler flags', ''),