Skip to content
Snippets Groups Projects
Commit a6b1c0a8 authored by Ken Hughes's avatar Ken Hughes
Browse files

Added WITH_BF_NOBLENDER to scons so that blenderplayer can be compiler by...

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' ".
parent 18072f55
Branches
Tags
No related merge requests found
...@@ -363,6 +363,7 @@ dobj = B.buildinfo(env, "dynamic") + B.resources ...@@ -363,6 +363,7 @@ dobj = B.buildinfo(env, "dynamic") + B.resources
thestatlibs, thelibincs = B.setup_staticlibs(env) thestatlibs, thelibincs = B.setup_staticlibs(env)
thesyslibs = B.setup_syslibs(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']: if env['WITH_BF_PLAYER']:
playerlist = B.create_blender_liblist(env, 'player') playerlist = B.create_blender_liblist(env, 'player')
...@@ -534,6 +535,10 @@ nsisaction = env.Action(btools.NSIS_Installer, btools.NSIS_print) ...@@ -534,6 +535,10 @@ nsisaction = env.Action(btools.NSIS_Installer, btools.NSIS_print)
nsiscmd = env.Command('nsisinstaller', None, nsisaction) nsiscmd = env.Command('nsisinstaller', None, nsisaction)
nsisalias = env.Alias('nsis', nsiscmd) 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']: if env['WITH_BF_PLAYER']:
blenderplayer = env.Alias('blenderplayer', B.program_list) blenderplayer = env.Alias('blenderplayer', B.program_list)
Depends(blenderplayer,installtarget) Depends(blenderplayer,installtarget)
......
...@@ -52,6 +52,7 @@ def validate_arguments(args, bc): ...@@ -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_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_FTGL', 'BF_FTGL', 'BF_FTGL_INC', 'BF_FTGL_LIB',
'WITH_BF_PLAYER', 'WITH_BF_PLAYER',
'WITH_BF_NOBLENDER',
'WITH_BF_BINRELOC', 'WITH_BF_BINRELOC',
'CFLAGS', 'CCFLAGS', 'CPPFLAGS', 'CFLAGS', 'CCFLAGS', 'CPPFLAGS',
'REL_CFLAGS', 'REL_CCFLAGS', 'REL_CFLAGS', 'REL_CCFLAGS',
...@@ -310,6 +311,7 @@ def read_opts(cfg, args): ...@@ -310,6 +311,7 @@ def read_opts(cfg, args):
('BF_FTGL_LIB', 'FTGL libraries', ''), ('BF_FTGL_LIB', 'FTGL libraries', ''),
(BoolOption('WITH_BF_PLAYER', 'Build blenderplayer if true', 'false')), (BoolOption('WITH_BF_PLAYER', 'Build blenderplayer if true', 'false')),
(BoolOption('WITH_BF_NOBLENDER', 'Do not build blender if true', 'false')),
('CFLAGS', 'C-compiler flags', ''), ('CFLAGS', 'C-compiler flags', ''),
('CCFLAGS', 'C++-compiler flags', ''), ('CCFLAGS', 'C++-compiler flags', ''),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment