From 7bdb62900988b23a244ddcee516554d9f2916b85 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Sun, 5 Oct 2008 21:33:23 +0000 Subject: [PATCH] * merge main SConstruct and some of the utility scripts for our scons build from trunk. Note: I'll be working on improving our scons build environment in this branch Note2: I'll be upgrading our scripts to work fully with scons 1.0 (and possibly later) --- SConstruct | 201 ++++++++++++++++++++++++++++++-------- config/win32-vc-config.py | 59 ++++++----- tools/Blender.py | 81 +++++++++------ tools/btools.py | 69 ++++++++++--- 4 files changed, 302 insertions(+), 108 deletions(-) diff --git a/SConstruct b/SConstruct index 2f3f32308fc..0a959cc5b7b 100644 --- a/SConstruct +++ b/SConstruct @@ -36,6 +36,7 @@ import string import shutil import glob import re +from tempfile import mkdtemp import tools.Blender import tools.btools @@ -142,7 +143,7 @@ if crossbuild and platform!='win32': env['OURPLATFORM'] = platform -configfile = B.arguments.get('BF_CONFIG', 'config'+os.sep+platform+'-config.py') +configfile = 'config'+os.sep+platform+'-config.py' if os.path.exists(configfile): print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile @@ -156,13 +157,14 @@ if crossbuild and env['PLATFORM'] != 'win32': # Needed for gui programs, console programs should do without it env.Append(LINKFLAGS=['-mwindows']) +userconfig = B.arguments.get('BF_CONFIG', 'user-config.py') # first read platform config. B.arguments will override optfiles = [configfile] -if os.path.exists('user-config.py'): - print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + 'user-config.py' - optfiles += ['user-config.py'] +if os.path.exists(userconfig): + print B.bc.OKGREEN + "Using user-config file: " + B.bc.ENDC + userconfig + optfiles += [userconfig] else: - print B.bc.WARNING + 'user-config.py' + " not found, no user overrides" + B.bc.ENDC + print B.bc.WARNING + userconfig + " not found, no user overrides" + B.bc.ENDC opts = btools.read_opts(optfiles, B.arguments) opts.Update(env) @@ -176,6 +178,23 @@ if env['BF_NO_ELBEEM'] == 1: env['CXXFLAGS'].append('-DDISABLE_ELBEEM') env['CCFLAGS'].append('-DDISABLE_ELBEEM') +if env['WITH_BF_OPENMP'] == 1: + if env['OURPLATFORM']=='win32-vc': + env['CCFLAGS'].append('/openmp') + env['CPPFLAGS'].append('/openmp') + env['CXXFLAGS'].append('/openmp') + else: + if env['CC'][-3:] == 'icc': # to be able to handle CC=/opt/bla/icc case + env.Append(LINKFLAGS=['-openmp', '-static-intel']) + env['CCFLAGS'].append('-openmp') + env['CPPFLAGS'].append('-openmp') + env['CXXFLAGS'].append('-openmp') + else: + env.Append(CCFLAGS=['-fopenmp']) + env.Append(CPPFLAGS=['-fopenmp']) + env.Append(CXXFLAGS=['-fopenmp']) + # env.Append(LINKFLAGS=['-fprofile-generate']) + #check for additional debug libnames if env.has_key('BF_DEBUG_LIBS'): @@ -204,22 +223,31 @@ if env['OURPLATFORM'] == 'linux2' : return result env2 = env.Copy( LIBPATH = env['BF_OPENAL'] ) - conf = Configure( env2, {'CheckFreeAlut' : CheckFreeAlut}, '.sconf_temp', '/dev/null' ) + sconf_temp = mkdtemp() + conf = Configure( env2, {'CheckFreeAlut' : CheckFreeAlut}, sconf_temp, '/dev/null' ) if conf.CheckFreeAlut( env2 ): env['BF_OPENAL_LIB'] += ' alut' del env2 - for root, dirs, files in os.walk('.sconf_temp', topdown=False): + root = '' + for root, dirs, files in os.walk(sconf_temp, topdown=False): for name in files: os.remove(os.path.join(root, name)) for name in dirs: os.rmdir(os.path.join(root, name)) - os.rmdir(root) + if root: os.rmdir(root) if len(B.quickdebug) > 0 and printdebug != 0: print B.bc.OKGREEN + "Buildings these libs with debug symbols:" + B.bc.ENDC 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 @@ -227,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'] @@ -244,10 +297,18 @@ if not quickie and do_clean: if os.path.exists(B.root_build_dir): print B.bc.HEADER+'Cleaning...'+B.bc.ENDC dirs = os.listdir(B.root_build_dir) - for dir in dirs: - if os.path.isdir(B.root_build_dir + dir) == 1: - print "clean dir %s"%(B.root_build_dir+dir) - shutil.rmtree(B.root_build_dir+dir) + for entry in dirs: + if os.path.isdir(B.root_build_dir + entry) == 1: + print "clean dir %s"%(B.root_build_dir+entry) + shutil.rmtree(B.root_build_dir+entry) + else: # remove file + print "remove file %s"%(B.root_build_dir+entry) + os.remove(B.root_build_dir+entry) + for confile in ['extern/ffmpeg/config.mak', 'extern/x264/config.mak', + 'extern/xvidcore/build/generic/platform.inc']: + if os.path.exists(confile): + print "clean file %s"%confile + os.remove(confile) print B.bc.OKGREEN+'...done'+B.bc.ENDC else: print B.bc.HEADER+'Already Clean, nothing to do.'+B.bc.ENDC @@ -266,7 +327,7 @@ Help(opts.GenerateHelpText(env)) # default is new quieter output, but if you need to see the # commands, do 'scons BF_QUIET=0' bf_quietoutput = B.arguments.get('BF_QUIET', '1') -if bf_quietoutput=='1': +if env['BF_QUIET']: B.set_quiet_output(env) else: if toolset=='msvc': @@ -330,33 +391,56 @@ else: blenderinstall = env.Install(dir=env['BF_INSTALLDIR'], source=B.program_list) #-- .blender +#- dont do .blender and scripts for darwin, it is already in the bundle dotblendlist = [] dottargetlist = [] -for dp, dn, df in os.walk('bin/.blender'): - if 'CVS' in dn: - dn.remove('CVS') - if '.svn' in dn: - dn.remove('.svn') - for f in df: - dotblendlist.append(dp+os.sep+f) - dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f) - -dotblenderinstall = [] -for targetdir,srcfile in zip(dottargetlist, dotblendlist): - td, tf = os.path.split(targetdir) - dotblenderinstall.append(env.Install(dir=td, source=srcfile)) - -#-- .blender/scripts scriptinstall = [] -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['OURPLATFORM']!='darwin': + for dp, dn, df in os.walk('bin/.blender'): + if 'CVS' in dn: + dn.remove('CVS') + if '.svn' in dn: + dn.remove('.svn') + for f in df: + dotblendlist.append(dp+os.sep+f) + dottargetlist.append(env['BF_INSTALLDIR']+dp[3:]+os.sep+f) + + dotblenderinstall = [] + for targetdir,srcfile in zip(dottargetlist, dotblendlist): + 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)) + +#-- 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 = [] @@ -367,9 +451,26 @@ for tp, tn, tf in os.walk('release/plugins'): if '.svn' in tn: tn.remove('.svn') for f in tf: + print ">>>", env['BF_INSTALLDIR'], tp, f pluglist.append(tp+os.sep+f) plugtargetlist.append(env['BF_INSTALLDIR']+tp[7:]+os.sep+f) +# header files for plugins +pluglist.append('source/blender/blenpluginapi/documentation.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'documentation.h') +pluglist.append('source/blender/blenpluginapi/externdef.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'externdef.h') +pluglist.append('source/blender/blenpluginapi/floatpatch.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'floatpatch.h') +pluglist.append('source/blender/blenpluginapi/iff.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'iff.h') +pluglist.append('source/blender/blenpluginapi/plugin.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'plugin.h') +pluglist.append('source/blender/blenpluginapi/util.h') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep +'util.h') +pluglist.append('source/blender/blenpluginapi/plugin.DEF') +plugtargetlist.append(env['BF_INSTALLDIR'] + os.sep + 'plugins' + os.sep + 'include' + os.sep + 'plugin.def') + plugininstall = [] for targetdir,srcfile in zip(plugtargetlist, pluglist): td, tf = os.path.split(targetdir) @@ -387,7 +488,12 @@ for tp, tn, tf in os.walk('release/text'): textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist) -allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall] +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] if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll', @@ -398,7 +504,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): '${LCGDIR}/zlib/lib/zlib.dll', '${LCGDIR}/tiff/lib/libtiff.dll'] if env['BF_DEBUG']: - dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll') + dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}_d.dll') else: dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll') if env['OURPLATFORM'] == 'win32-mingw': @@ -409,8 +515,15 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): dllsources += ['${LCGDIR}/iconv/lib/iconv.dll'] if env['WITH_BF_FFMPEG']: dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll', - '${LCGDIR}/ffmpeg/lib/avformat-51.dll', - '${LCGDIR}/ffmpeg/lib/avutil-49.dll'] + '${LCGDIR}/ffmpeg/lib/avformat-52.dll', + '${LCGDIR}/ffmpeg/lib/avdevice-52.dll', + '${LCGDIR}/ffmpeg/lib/avutil-49.dll', + '${LCGDIR}/ffmpeg/lib/libfaad-0.dll', + '${LCGDIR}/ffmpeg/lib/libfaac-0.dll', + '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll', + '${LCGDIR}/ffmpeg/lib/libx264-59.dll', + '${LCGDIR}/ffmpeg/lib/xvidcore.dll', + '${LCGDIR}/ffmpeg/lib/swscale-0.dll'] windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources) allinstall += windlls @@ -429,12 +542,16 @@ 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) if not env['WITHOUT_BF_INSTALL']: - Default(installtarget) + Default(installtarget) #------------ RELEASE # TODO: zipup the installation diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index eae4f490b38..1b7737ed004 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -5,11 +5,11 @@ WITH_BF_VERSE = 'false' BF_VERSE_INCLUDE = "#extern/verse/dist" # enable ffmpeg support -WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG +WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG BF_FFMPEG = LIBDIR +'/ffmpeg' BF_FFMPEG_INC = '${BF_FFMPEG}/include' BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' -BF_FFMPEG_LIB = 'avformat-51.lib avcodec-51.lib avutil-49.lib' +BF_FFMPEG_LIB = 'avformat-52.lib avcodec-51.lib avdevice-52.lib avutil-49.lib swscale-0.lib' BF_PYTHON = LIBDIR + '/python' BF_PYTHON_VERSION = '2.5' @@ -19,10 +19,18 @@ BF_PYTHON_LIB = 'python25' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' WITH_BF_OPENAL = 'true' +WITH_BF_STATICOPENAL = 'false' BF_OPENAL = LIBDIR + '/openal' BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL ' -BF_OPENAL_LIB = 'openal_static' +BF_OPENAL_LIB = 'dxguid openal_static' BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib' +# Warning, this static lib configuration is untested! users of this OS please confirm. +BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a' + +# TODO - are these useful on win32? +# BF_CXX = '/usr' +# WITH_BF_STATICCXX = 'false' +# BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a' WITH_BF_ICONV = 'true' BF_ICONV = LIBDIR + '/iconv' @@ -45,10 +53,13 @@ WITH_BF_FMOD = 'false' BF_FMOD = LIBDIR + '/fmod' WITH_BF_OPENEXR = 'true' +WITH_BF_STATICOPENEXR = 'false' BF_OPENEXR = LIBDIR + '/openexr' BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath ' BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread ' -BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_msvc' +BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_vs2008' +# Warning, this static lib configuration is untested! users of this OS please confirm. +BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a' WITH_BF_DDS = 'true' @@ -85,7 +96,8 @@ BF_FTGL = LIBDIR + '/ftgl' BF_FTGL_INC = '${BF_FTGL}/include' BF_FTGL_LIB = 'extern_ftgl' -WITH_BF_GAMEENGINE = 'false' +WITH_BF_GAMEENGINE = 'true' +WITH_BF_PLAYER = 'true' WITH_BF_ODE = 'true' BF_ODE = LIBDIR + '/ode' @@ -106,6 +118,8 @@ BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE' WITH_BF_YAFRAY = 'true' +WITH_BF_BINRELOC = 'false' + #WITH_BF_NSPR = 'true' #BF_NSPR = $(LIBDIR)/nspr #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr @@ -145,34 +159,31 @@ BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a' CC = 'cl.exe' CXX = 'cl.exe' -CCFLAGS = ['/nologo', '/Ot', '/Ob1', '/EHsc', '/J', '/W3', '/Gd', '/MT'] +CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT'] BF_DEBUG_FLAGS = ['/Zi', '/FR${TARGET}.sbr'] -CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DUSE_OPENAL', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE'] +CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE'] REL_CFLAGS = ['-O2', '-DNDEBUG'] REL_CCFLAGS = ['-O2', '-DNDEBUG'] C_WARN = [] CC_WARN = [] -LLIBS = 'ws2_32 dxguid vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid' +LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid' PLATFORM_LINKFLAGS = ''' - /SUBSYSTEM:CONSOLE - /MACHINE:IX86 - /ENTRY:mainCRTStartup - /INCREMENTAL:NO - /NODEFAULTLIB:"msvcprt.lib" - /NODEFAULTLIB:"glut32.lib" - /NODEFAULTLIB:"libc.lib" - /NODEFAULTLIB:"libcd.lib" - /NODEFAULTLIB:"libcpd.lib" - /NODEFAULTLIB:"libcp.lib" - /NODEFAULTLIB:"libcmtd.lib" - ''' - + /SUBSYSTEM:CONSOLE + /MACHINE:IX86 + /ENTRY:mainCRTStartup + /INCREMENTAL:NO + /NODEFAULTLIB:"msvcprt.lib" + /NODEFAULTLIB:"glut32.lib" + /NODEFAULTLIB:"libc.lib" + /NODEFAULTLIB:"libcd.lib" + /NODEFAULTLIB:"libcpd.lib" + /NODEFAULTLIB:"libcp.lib" + /LARGEADDRESSAWARE + ''' + BF_BUILDDIR = '..\\build\\win32-vc' BF_INSTALLDIR='..\\install\\win32-vc' - -BF_DEBUG = 'true' -BF_BSC = 'false' diff --git a/tools/Blender.py b/tools/Blender.py index 3af86b6d420..47bc5e9fa72 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -69,10 +69,10 @@ def internal_lib_to_dict(dict = None, libtype = None, libname = None, priority = dict[libtype][priority] = libname # libtype and priority can both be lists, for defining lib in multiple places -def add_lib_to_dict(dict = None, libtype = None, libname = None, priority = 100): +def add_lib_to_dict(env, dict = None, libtype = None, libname = None, priority = 100): if not dict or not libtype or not libname: print "Passed wrong arg" - Exit() + env.Exit() if type(libtype) is str and type(priority) is int: internal_lib_to_dict(dict, libtype, libname, priority) @@ -82,10 +82,10 @@ def add_lib_to_dict(dict = None, libtype = None, libname = None, priority = 100) internal_lib_to_dict(dict, lt, libname, p) else: print "libtype and priority lists are unequal in length" - Exit() + env.Exit() else: print "Wrong type combinations for libtype and priority. Only str and int or list and list" - Exit() + env.Exit() def create_blender_liblist(lenv = None, libtype = None): if not lenv or not libtype: @@ -93,11 +93,9 @@ def create_blender_liblist(lenv = None, libtype = None): lst = [] if libtype in possible_types: - sortlist = [] - for k,v in libs[libtype].iteritems(): - sortlist.append(k) - sortlist.sort() curlib = libs[libtype] + sortlist = curlib.keys() + sortlist.sort() for sk in sortlist: v = curlib[sk] lst.append('#' + root_build_dir + 'lib/'+lenv['LIBPREFIX'] + v + lenv['LIBSUFFIX']) @@ -113,24 +111,35 @@ def setup_staticlibs(lenv): '/usr/lib', lenv['BF_PYTHON_LIBPATH'], lenv['BF_OPENGL_LIBPATH'], - lenv['BF_SDL_LIBPATH'], lenv['BF_JPEG_LIBPATH'], lenv['BF_PNG_LIBPATH'], lenv['BF_ZLIB_LIBPATH'], lenv['BF_ICONV_LIBPATH'] ] - libincs += Split(lenv['BF_OPENEXR_LIBPATH']) - libincs += Split(lenv['BF_FFMPEG_LIBPATH']) + if lenv['WITH_BF_SDL']: + libincs += Split(lenv['BF_SDL_LIBPATH']) + if lenv['WITH_BF_FFMPEG']: + libincs += Split(lenv['BF_FFMPEG_LIBPATH']) + if lenv['WITH_BF_STATICCXX']: + statlibs += Split(lenv['BF_CXX_LIB_STATIC']) + if lenv['WITH_BF_OPENEXR']: + libincs += Split(lenv['BF_OPENEXR_LIBPATH']) + if lenv['WITH_BF_STATICOPENEXR']: + statlibs += Split(lenv['BF_OPENEXR_LIB_STATIC']) if lenv['WITH_BF_INTERNATIONAL']: libincs += Split(lenv['BF_GETTEXT_LIBPATH']) libincs += Split(lenv['BF_FREETYPE_LIBPATH']) if lenv['WITH_BF_OPENAL']: libincs += Split(lenv['BF_OPENAL_LIBPATH']) - + if lenv['WITH_BF_STATICOPENAL']: + statlibs += Split(lenv['BF_OPENAL_LIB_STATIC']) if lenv['WITH_BF_STATICOPENGL']: statlibs += Split(lenv['BF_OPENGL_LIB_STATIC']) + if lenv['WITH_BF_STATICPYTHON']: + statlibs += Split(lenv['BF_PYTHON_LIB_STATIC']) + if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross'): libincs += Split(lenv['BF_PTHREADS_LIBPATH']) @@ -143,22 +152,32 @@ def setup_syslibs(lenv): lenv['BF_PNG_LIB'], lenv['BF_ZLIB_LIB'] ] - if lenv['BF_DEBUG']==1 and lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): - syslibs.append(lenv['BF_PYTHON_LIB']+'_d') - else: - syslibs.append(lenv['BF_PYTHON_LIB']) + + if not lenv['WITH_BF_STATICPYTHON']: + if lenv['BF_DEBUG']==1 and lenv['OURPLATFORM'] in ('win32-vc'): + syslibs.append(lenv['BF_PYTHON_LIB']+'_d') + else: + syslibs.append(lenv['BF_PYTHON_LIB']) if lenv['WITH_BF_INTERNATIONAL']: syslibs += Split(lenv['BF_FREETYPE_LIB']) syslibs += Split(lenv['BF_GETTEXT_LIB']) if lenv['WITH_BF_OPENAL']: - syslibs += Split(lenv['BF_OPENAL_LIB']) + if not lenv['WITH_BF_STATICOPENAL']: + syslibs += Split(lenv['BF_OPENAL_LIB']) + if lenv['WITH_BF_OPENMP'] and lenv['CC'] != 'icc': + if lenv['CC'] == 'cl.exe': + syslibs += ['vcomp'] + else: + syslibs += ['gomp'] if lenv['WITH_BF_ICONV']: syslibs += Split(lenv['BF_ICONV_LIB']) if lenv['WITH_BF_OPENEXR']: - syslibs += Split(lenv['BF_OPENEXR_LIB']) + if not lenv['WITH_BF_STATICOPENEXR']: + syslibs += Split(lenv['BF_OPENEXR_LIB']) if lenv['WITH_BF_FFMPEG']: syslibs += Split(lenv['BF_FFMPEG_LIB']) - syslibs += Split(lenv['BF_SDL_LIB']) + if lenv['WITH_BF_SDL']: + syslibs += Split(lenv['BF_SDL_LIB']) if not lenv['WITH_BF_STATICOPENGL']: syslibs += Split(lenv['BF_OPENGL_LIB']) if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross'): @@ -173,11 +192,10 @@ def propose_priorities(): for t in possible_types: print bc.OKGREEN+"\t"+t+bc.ENDC new_priority = 0 - sortlist = [] - for k,v in libs[t].iteritems(): - sortlist.append(k) - sortlist.sort() curlib = libs[t] + sortlist = curlib.keys() + sortlist.sort() + for sk in sortlist: v = curlib[sk] #for p,v in sorted(libs[t].iteritems()): @@ -222,21 +240,22 @@ def buildinfo(lenv, build_type): def my_compile_print(target, source, env): a = '%s' % (source[0]) d, f = os.path.split(a) - return bc.OKBLUE+"Compiling"+bc.ENDC +" ==> '"+bc.OKGREEN+"%s" % (f) + bc.ENDC + "'" + return bc.OKBLUE+"Compiling"+bc.ENDC +" ==> '"+bc.OKGREEN+"%s" % (f) + "'"+bc.ENDC + def my_moc_print(target, source, env): a = '%s' % (source[0]) d, f = os.path.split(a) - return bc.OKBLUE+"Creating MOC"+bc.ENDC+ " ==> '"+bc.OKGREEN+"%s" %(f) + bc.ENDC+ "'" + return bc.OKBLUE+"Creating MOC"+bc.ENDC+ " ==> '"+bc.OKGREEN+"%s" %(f) + "'"+bc.ENDC def my_linking_print(target, source, env): t = '%s' % (target[0]) d, f = os.path.split(t) - return bc.OKBLUE+"Linking library"+bc.ENDC +" ==> '"+bc.OKGREEN+"%s" % (f) + bc.ENDC+ "'" + return bc.OKBLUE+"Linking library"+bc.ENDC +" ==> '"+bc.OKGREEN+"%s" % (f) + "'"+bc.ENDC def my_program_print(target, source, env): t = '%s' % (target[0]) d, f = os.path.split(t) - return bc.OKBLUE+"Linking program"+bc.ENDC +" ==> '"+bc.OKGREEN+"%s" % (f) + bc.ENDC + "'" + return bc.OKBLUE+"Linking program"+bc.ENDC +" ==> '"+bc.OKGREEN+"%s" % (f) + "'"+bc.ENDC def msvc_hack(env): static_lib = SCons.Tool.createStaticLibBuilder(env) @@ -365,7 +384,7 @@ class BlenderEnvironment(SConsEnvironment): global libs if not self or not libname or not source: print bc.FAIL+'Cannot continue. Missing argument for BlenderRes '+libname+bc.ENDC - Exit() + self.Exit() if self['OURPLATFORM'] not in ('win32-vc','win32-mingw','linuxcross'): print bc.FAIL+'BlenderRes is for windows only!'+bc.END self.Exit() @@ -380,7 +399,7 @@ class BlenderEnvironment(SConsEnvironment): def BlenderLib(self=None, libname=None, sources=None, includes=[], defines=[], libtype='common', priority = 100, compileflags=None): if not self or not libname or not sources: print bc.FAIL+'Cannot continue. Missing argument for BuildBlenderLib '+libname+bc.ENDC - Exit() + self.Exit() if libname in quickie or len(quickie)==0: if libname in quickdebug: print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname +bc.ENDC+bc.OKBLUE+ " (debug mode)" + bc.ENDC @@ -391,6 +410,8 @@ class BlenderEnvironment(SConsEnvironment): lenv.Append(CPPDEFINES=defines) if lenv['WITH_BF_GAMEENGINE']: lenv.Append(CPPDEFINES=['GAMEBLENDER=1']) + if lenv['WITH_BF_BULLET']: + lenv.Append(CPPDEFINES=['WITH_BULLET=1']) # debug or not # CXXFLAGS defaults to CCFLAGS, therefore # we Replace() rather than Append() to CXXFLAGS the first time @@ -414,7 +435,7 @@ class BlenderEnvironment(SConsEnvironment): else: print bc.WARNING+'Not building '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC+' for '+bc.OKBLUE+'BF_QUICK'+bc.ENDC # note: libs is a global - add_lib_to_dict(libs, libtype, libname, priority) + add_lib_to_dict(self, libs, libtype, libname, priority) def BlenderProg(self=None, builddir=None, progname=None, sources=None, includes=None, libs=None, libpath=None, binarykind=''): print bc.HEADER+'Configuring program '+bc.ENDC+bc.OKGREEN+progname+bc.ENDC diff --git a/tools/btools.py b/tools/btools.py index a170380910d..58b667b486f 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -1,3 +1,4 @@ + import os import os.path import SCons.Options @@ -26,14 +27,14 @@ def print_arguments(args, bc): def validate_arguments(args, bc): opts_list = [ - 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'BF_PYTHON_LINKFLAGS', - 'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', + 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'BF_PYTHON_LINKFLAGS', 'WITH_BF_STATICPYTHON', 'BF_PYTHON_LIB_STATIC', + 'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_STATICOPENAL', 'BF_OPENAL_LIB_STATIC', 'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH', 'BF_PTHREADS', 'BF_PTHREADS_INC', 'BF_PTHREADS_LIB', 'BF_PTHREADS_LIBPATH', 'WITH_BF_FMOD', - 'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', + 'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', 'WITH_BF_STATICOPENEXR', 'BF_OPENEXR_LIB_STATIC', 'WITH_BF_DDS', - 'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB', 'BF_FFMPEG', 'BF_FFMPEG_INC', + 'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB','BF_FFMPEG_EXTRA', 'BF_FFMPEG', 'BF_FFMPEG_INC', 'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH', 'WITH_BF_PNG', 'BF_PNG', 'BF_PNG_INC', 'BF_PNG_LIB', 'BF_PNG_LIBPATH', 'BF_TIFF', 'BF_TIFF_INC', @@ -50,22 +51,29 @@ 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_BINRELOC', 'CFLAGS', 'CCFLAGS', 'CPPFLAGS', 'REL_CFLAGS', 'REL_CCFLAGS', 'C_WARN', 'CC_WARN', 'LLIBS', 'PLATFORM_LINKFLAGS', - 'BF_PROFILE_FLAGS', 'LCGDIR', 'WITH_BF_VERSE', - 'BF_VERSE_INCLUDE', + 'BF_PROFILE_FLAGS', 'LCGDIR', + 'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC' + 'WITH_BF_VERSE', 'BF_VERSE_INCLUDE', 'VERSE_BUILD_BINARY', 'VERSE_BUILD_DIR', 'VERSE_REGEN_PROTO', 'BF_TWEAK_MODE', 'BF_SPLIT_SRC', 'WITHOUT_BF_INSTALL', - 'BF_FANCY', + 'WITH_BF_OPENMP', + 'WITHOUT_BF_INSTALL', + 'BF_FANCY', 'BF_QUIET', + 'BF_X264_CONFIG', + 'BF_XVIDCORE_CONFIG', ] arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE', 'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME', 'BF_BUILDDIR', 'BF_FANCY', 'BF_QUICK', 'BF_PROFILE', - 'BF_DEBUG_FLAGS', 'BF_BSC', - 'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX', "BF_QUICKDEBUG", "BF_LISTDEBUG", 'LCGDIR'] + 'BF_DEBUG_FLAGS', 'BF_BSC', 'BF_CONFIG', + 'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX', 'BF_QUICKDEBUG', + 'BF_LISTDEBUG', 'LCGDIR', 'BF_X264_CONFIG', 'BF_XVIDCORE_CONFIG'] all_list = opts_list + arg_list okdict = {} @@ -87,7 +95,7 @@ def print_targets(targs, bc): def validate_targets(targs, bc): valid_list = ['.', 'blender', 'blenderstatic', 'blenderplayer', 'webplugin', - 'blendernogame', 'blenderstaticnogame', 'release', + 'blendernogame', 'blenderstaticnogame', 'blenderlite', 'release', 'everything', 'clean', 'install-bin', 'install', 'nsis'] oklist = [] for t in targs: @@ -132,20 +140,27 @@ def read_opts(cfg, args): ('VERSE_BUILD_DIR', 'Target directory for intermediate files.', "${BF_BUILDDIR}/extern/verse"), ('VERSE_REGEN_PROTO', 'Whether to regenerate the protocol files', 'yes'), ('BF_DEBUG_LIBS', 'list of libraries to build with debug symbols'), + ('BF_PYTHON', 'base path for python', ''), ('BF_PYTHON_VERSION', 'Python version to use', ''), ('BF_PYTHON_INC', 'include path for Python headers', ''), ('BF_PYTHON_BINARY', 'Path to the Python interpreter', ''), ('BF_PYTHON_LIB', 'Python library', ''), + ('BF_PYTHON_LIB_STATIC', 'Python static libraries', ''), ('BF_PYTHON_LIBPATH', 'Library path', ''), ('BF_PYTHON_LINKFLAGS', 'Python link flags', ''), + (BoolOption('WITH_BF_STATICPYTHON', 'Staticly link to python', 'false')), + (BoolOption('BF_NO_ELBEEM', 'Disable Fluid Sim', 'false')), (BoolOption('WITH_BF_YAFRAY', 'Enable Yafray', 'true')), + (BoolOption('WITH_BF_OPENAL', 'Use OpenAL if true', '')), ('BF_OPENAL', 'base path for OpenAL', ''), ('BF_OPENAL_INC', 'include path for python headers', ''), ('BF_OPENAL_LIB', 'Path to OpenAL library', ''), + ('BF_OPENAL_LIB_STATIC', 'Path to OpenAL static library', ''), ('BF_OPENAL_LIBPATH', 'Path to OpenAL library', ''), + (BoolOption('WITH_BF_STATICOPENAL', 'Staticly link to openal', 'false')), (BoolOption('WITH_BF_SDL', 'Use SDL if true', '')), ('BF_SDL', 'SDL base path', ''), @@ -162,16 +177,19 @@ def read_opts(cfg, args): # BF_FMOD = $(LCGDIR)/fmod (BoolOption('WITH_BF_OPENEXR', 'Use OPENEXR if true', 'true')), + (BoolOption('WITH_BF_STATICOPENEXR', 'Staticly link to OpenEXR', 'false')), ('BF_OPENEXR', 'OPENEXR base path', ''), ('BF_OPENEXR_INC', 'OPENEXR include path', ''), ('BF_OPENEXR_LIB', 'OPENEXR library', ''), ('BF_OPENEXR_LIBPATH', 'OPENEXR library path', ''), + ('BF_OPENEXR_LIB_STATIC', 'OPENEXR static library', ''), (BoolOption('WITH_BF_DDS', 'Use DDS if true', 'true')), (BoolOption('WITH_BF_FFMPEG', 'Use FFMPEG if true', 'false')), ('BF_FFMPEG', 'FFMPEG base path', ''), ('BF_FFMPEG_LIB', 'FFMPEG library', ''), + ('BF_FFMPEG_EXTRA', 'FFMPEG flags that must be preserved', ''), ('BF_FFMPEG_INC', 'FFMPEG includes', ''), ('BF_FFMPEG_LIBPATH', 'FFMPEG library path', ''), @@ -183,6 +201,18 @@ def read_opts(cfg, args): ('BF_JPEG_LIB', 'JPEG library', ''), ('BF_JPEG_LIBPATH', 'JPEG library path', ''), + (BoolOption('WITH_BF_OPENJPEG', 'Use OPENJPEG if true', 'false')), + ('BF_OPENJPEG', 'OPENJPEG base path', ''), + ('BF_OPENJPEG_INC', 'OPENJPEG include path', ''), + ('BF_OPENJPEG_LIB', 'OPENJPEG library', ''), + ('BF_OPENJPEG_LIBPATH', 'OPENJPEG library path', ''), + + (BoolOption('WITH_BF_REDCODE', 'Use REDCODE if true', 'false')), + ('BF_REDCODE', 'REDCODE base path', ''), + ('BF_REDCODE_INC', 'REDCODE include path', ''), + ('BF_REDCODE_LIB', 'REDCODE library', ''), + ('BF_REDCODE_LIBPATH', 'REDCODE library path', ''), + (BoolOption('WITH_BF_PNG', 'Use PNG if true', 'true')), ('BF_PNG', 'PNG base path', ''), ('BF_PNG_INC', 'PNG include path', ''), @@ -227,6 +257,9 @@ def read_opts(cfg, args): ('BF_SOLID_INC', 'Solid include path', ''), ('BF_WINTAB', 'WinTab base dir', ''), ('BF_WINTAB_INC', 'WinTab include dir', ''), + ('BF_CXX', 'c++ base path for libstdc++, only used when static linking', ''), + (BoolOption('WITH_BF_STATICCXX', 'static link to stdc++', 'false')), + ('BF_CXX_LIB_STATIC', 'static library path for stdc++', ''), ## ##WITH_BF_NSPR = 'true' ##BF_NSPR = $(LCGDIR)/nspr @@ -250,6 +283,8 @@ def read_opts(cfg, args): ('BF_FREETYPE_LIB', 'Freetype library', ''), ('BF_FREETYPE_LIBPATH', 'Freetype library path', ''), + (BoolOption('WITH_BF_OPENMP', 'Use OpenMP if true', 'false')), + (BoolOption('WITH_BF_QUICKTIME', 'Use QuickTime if true', 'false')), ('BF_QUICKTIME', 'QuickTime base path', ''), ('BF_QUICKTIME_INC', 'QuickTime include path', ''), @@ -290,7 +325,7 @@ def read_opts(cfg, args): ('BF_DEBUG_FLAGS', 'Debug flags', ''), (BoolOption('BF_BSC', 'Create .bsc files (msvc only)', 'true')), - + ('BF_BUILDDIR', 'Build dir', ''), ('BF_INSTALLDIR', 'Installation dir', ''), @@ -303,6 +338,13 @@ def read_opts(cfg, args): (BoolOption('BF_SPLIT_SRC', 'Split src lib into several chunks if true', 'false')), (BoolOption('WITHOUT_BF_INSTALL', 'dont install if true', 'false')), (BoolOption('BF_FANCY', 'Enable fancy output if true', 'true')), + (BoolOption('BF_QUIET', 'Enable silent output if true', 'true')), + (BoolOption('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', 'false')), + + ('BF_X264_CONFIG', 'configuration flags for x264', ''), + ('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''), + + ('BF_CONFIG', 'SCons python config file used to set default options', 'user_config.py'), ) # end of opts.AddOptions() @@ -489,5 +531,8 @@ def NSIS_Installer(target=None, source=None, env=None): data, err = proc.communicate() rv = proc.wait() - return 0 + if rv != 0: + print + print data.strip().split("\n")[-1] + return rv