[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17116] trunk/blender: Added WITH_BF_NOBLENDER to scons so that blenderplayer can be compiler by itself (false by default).
Ken Hughes
khughes at pacific.edu
Sun Oct 19 23:25:18 CEST 2008
Revision: 17116
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17116
Author: khughes
Date: 2008-10-19 23:25:17 +0200 (Sun, 19 Oct 2008)
Log Message:
-----------
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' ".
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/tools/btools.py
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2008-10-19 17:17:44 UTC (rev 17115)
+++ trunk/blender/SConstruct 2008-10-19 21:25:17 UTC (rev 17116)
@@ -363,7 +363,8 @@
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 @@
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)
Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py 2008-10-19 17:17:44 UTC (rev 17115)
+++ trunk/blender/tools/btools.py 2008-10-19 21:25:17 UTC (rev 17116)
@@ -52,6 +52,7 @@
'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 @@
('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', ''),
More information about the Bf-blender-cvs
mailing list