diff options
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 50 |
1 files changed, 36 insertions, 14 deletions
diff --git a/SConstruct b/SConstruct index 59152cdc9f3..6cd89671bd9 100644 --- a/SConstruct +++ b/SConstruct @@ -115,8 +115,8 @@ if toolset: env.Tool('mstoolkit', ['tools']) else: env = BlenderEnvironment(tools=[toolset], ENV = os.environ) - if env: - btools.SetupSpawn(env) + #if env: + # btools.SetupSpawn(env) else: env = BlenderEnvironment(ENV = os.environ) @@ -249,7 +249,7 @@ if len(B.quickdebug) > 0 and printdebug != 0: # 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++', ' ') + env['LLIBS'].remove('stdc++') else: print '\tcould not remove stdc++ library from LLIBS, WITH_BF_STATICCXX may not work for your platform' @@ -284,6 +284,10 @@ if 'blenderlite' in B.targets: env['BF_NO_ELBEEM'] = True env['WITH_BF_PYTHON'] = False +if env['WITH_BF_SDL'] == False and env['OURPLATFORM'] in ('win32-vc', 'win32-ming'): + env['PLATFORM_LINKFLAGS'].remove('/ENTRY:mainCRTStartup') + env['PLATFORM_LINKFLAGS'].append('/ENTRY:main') + # 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'] @@ -421,8 +425,18 @@ if env['OURPLATFORM']!='darwin': dn.remove('CVS') if '.svn' in dn: dn.remove('.svn') + for f in df: - dotblendlist.append(dp+os.sep+f) + if not env['WITH_BF_INTERNATIONAL']: + if 'locale' in dp: + continue + if f == '.Blanguages': + continue + if not env['WITH_BF_FREETYPE']: + if f.endswith('.ttf'): + continue + + dotblendlist.append(os.path.join(dp, f)) dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f) dotblenderinstall = [] @@ -430,16 +444,17 @@ if env['OURPLATFORM']!='darwin': td, tf = os.path.split(targetdir) dotblenderinstall.append(env.Install(dir=td, source=srcfile)) - #-- .blender/scripts - scriptpath='release/scripts' - for dp, dn, df in os.walk(scriptpath): - if 'CVS' in dn: - dn.remove('CVS') - if '.svn' in dn: - dn.remove('.svn') - dir=env['BF_INSTALLDIR']+'/.blender/scripts'+dp[len(scriptpath):] - source=[dp+os.sep+f for f in df] - scriptinstall.append(env.Install(dir=dir,source=source)) + if env['WITH_BF_PYTHON']: + #-- .blender/scripts + scriptpath='release/scripts' + for dp, dn, df in os.walk(scriptpath): + if 'CVS' in dn: + dn.remove('CVS') + if '.svn' in dn: + dn.remove('.svn') + dir=env['BF_INSTALLDIR']+'/.blender/scripts'+dp[len(scriptpath):] + source=[dp+os.sep+f for f in df] + scriptinstall.append(env.Install(dir=dir,source=source)) #-- icons if env['OURPLATFORM']=='linux2': @@ -461,6 +476,13 @@ if env['OURPLATFORM']=='linux2': td, tf = os.path.split(targetdir) iconinstall.append(env.Install(dir=td, source=srcfile)) +# dlls for linuxcross +# TODO - add more libs, for now this lets blenderlite run +if env['OURPLATFORM']=='linuxcross': + dir=env['BF_INSTALLDIR'] + source = ['../lib/windows/pthreads/lib/pthreadGC2.dll'] + scriptinstall.append(env.Install(dir=dir, source=source)) + #-- plugins pluglist = [] plugtargetlist = [] |