diff options
author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-09-28 21:07:08 +0400 |
---|---|---|
committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-09-28 21:07:08 +0400 |
commit | 26709ce90c09f784c78978fc54930dc0d9e76ca3 (patch) | |
tree | a4964ae40195f0309da56b675e195caba163f8c3 /SConstruct | |
parent | 920bb95aabf581e2cdf25568c77e276078c3689b (diff) | |
parent | 1e62b58bccdf7e2745f77e04e95eb02af1552d1f (diff) |
soc-2008-mxcurioni: merged changes to revision 16789
Diffstat (limited to 'SConstruct')
-rw-r--r-- | SConstruct | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct index 09d5a0322da..677eef3881d 100644 --- a/SConstruct +++ b/SConstruct @@ -241,6 +241,13 @@ if len(B.quickdebug) > 0 and printdebug != 0: for l in B.quickdebug: print "\t" + l +# remove stdc++ from LLIBS if we are building a statc linked CXXFLAGS +if env['WITH_BF_STATICCXX']: + if 'stdc++' in env['LLIBS']: + env['LLIBS'] = env['LLIBS'].replace('stdc++', ' ') + else: + print '\tcould not remove stdc++ library from LLIBS, WITH_BF_STATICCXX may not work for your platform' + # check target for blenderplayer. Set WITH_BF_PLAYER if found on cmdline if 'blenderplayer' in B.targets: env['WITH_BF_PLAYER'] = True @@ -248,6 +255,31 @@ if 'blenderplayer' in B.targets: if 'blendernogame' in B.targets: env['WITH_BF_GAMEENGINE'] = False +if 'blenderlite' in B.targets: + env['WITH_BF_GAMEENGINE'] = False + env['WITH_BF_OPENAL'] = False + env['WITH_BF_OPENEXR'] = False + env['WITH_BF_ICONV'] = False + env['WITH_BF_INTERNATIONAL'] = False + env['WITH_BF_OPENJPEG'] = False + env['WITH_BF_FFMPEG'] = False + env['WITH_BF_QUICKTIME'] = False + env['WITH_BF_YAFRAY'] = False + env['WITH_BF_REDCODE'] = False + env['WITH_BF_FTGL'] = False + env['WITH_BF_DDS'] = False + env['WITH_BF_ZLIB'] = False + env['WITH_BF_SDL'] = False + env['WITH_BF_JPEG'] = False + env['WITH_BF_PNG'] = False + env['WITH_BF_ODE'] = False + env['WITH_BF_BULLET'] = False + env['WITH_BF_BINRELOC'] = False + env['BF_BUILDINFO'] = False + env['BF_NO_ELBEEM'] = True + + + # lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir #B.root_build_dir = B.arguments.get('BF_BUILDDIR', '..'+os.sep+'build'+os.sep+platform+os.sep) B.root_build_dir = env['BF_BUILDDIR'] @@ -398,6 +430,26 @@ if env['OURPLATFORM']!='darwin': source=[dp+os.sep+f for f in df] scriptinstall.append(env.Install(dir=dir,source=source)) +#-- icons +if env['OURPLATFORM']=='linux2': + iconlist = [] + icontargetlist = [] + + for tp, tn, tf in os.walk('release/freedesktop/icons'): + if 'CVS' in tn: + tn.remove('CVS') + if '.svn' in tn: + tn.remove('.svn') + for f in tf: + print ">>>", env['BF_INSTALLDIR'], tp, f + iconlist.append(tp+os.sep+f) + icontargetlist.append(env['BF_INSTALLDIR']+tp[19:]+os.sep+f) + + iconinstall = [] + for targetdir,srcfile in zip(icontargetlist, iconlist): + td, tf = os.path.split(targetdir) + iconinstall.append(env.Install(dir=td, source=srcfile)) + #-- plugins pluglist = [] plugtargetlist = [] @@ -446,6 +498,8 @@ textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist) if env['OURPLATFORM']=='darwin': allinstall = [blenderinstall, plugininstall, textinstall] +elif env['OURPLATFORM']=='linux2': + allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall] else: allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall] @@ -496,6 +550,10 @@ if not env['WITH_BF_GAMEENGINE']: blendernogame = env.Alias('blendernogame', B.program_list) Depends(blendernogame,installtarget) +if 'blenderlite' in B.targets: + blenderlite = env.Alias('blenderlite', B.program_list) + Depends(blenderlite,installtarget) + Depends(nsiscmd, allinstall) Default(B.program_list) |