Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* Minimum SCons version is now 1.0.0

Browse Source 
- Code has been changed to reflect this (ie. deprecated functions are not anymore used)
* clean up the C and C++ compiler flags mess.
  - in the environment construction of BlenderLib all the compile flag governing options have been split in the *C*, *CC* and *CXX* containing equivalents.
    C is for C compiler only flags. CC is for C and C++ compiler flags and CXX is for C++ compiler only flags.
    All the platform default config files need to be double checked and fixed wherever it looks necessary. Either DIY, or send me a note with needed changes.
  - a start for the BlenderLib parameter list has been made - all the SConscripts need to be checked and modified to hand in flags properly.
* A theeth request: make -jN settable in the config file.
  - I give you BF_NUMJOBS, which is set to 1 by default. In your user-config.py, set BF_NUMJOBS=4 to have 4 parallel jobs handled. Yay.
This commit is contained in:
Nathan Letwory
2008-10-30 23:55:07 +00:00
parent dca18fc332
commit 0bd7934be7
7 changed files with 111 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SConstruct
View File

@@ -42,6 +42,8 @@ import tools.Blender
import tools.btools import tools.btools
import tools.bcolors import tools.bcolors
EnsureSConsVersion(1,0,0)
BlenderEnvironment = tools.Blender.BlenderEnvironment BlenderEnvironment = tools.Blender.BlenderEnvironment
btools = tools.btools btools = tools.btools
B = tools.Blender B = tools.Blender
@@ -172,6 +174,9 @@ opts.Update(env)
if not env['BF_FANCY']: if not env['BF_FANCY']:
B.bc.disable() B.bc.disable()
SetOption('num_jobs', int(env['BF_NUMJOBS']))
print "Build with %d parallel jobs" % (GetOption('num_jobs'))
# disable elbeem (fluidsim) compilation? # disable elbeem (fluidsim) compilation?
if env['BF_NO_ELBEEM'] == 1: if env['BF_NO_ELBEEM'] == 1:
env['CPPFLAGS'].append('-DDISABLE_ELBEEM') env['CPPFLAGS'].append('-DDISABLE_ELBEEM')

5
config/win32-vc-config.py
View File

@@ -162,13 +162,16 @@ CXX = 'cl.exe'
CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT'] CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
BF_DEBUG_FLAGS = ['/Zi', '/FR${TARGET}.sbr'] BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-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_CFLAGS = ['-O2', '-DNDEBUG']
REL_CCFLAGS = ['-O2', '-DNDEBUG'] REL_CCFLAGS = ['-O2', '-DNDEBUG']
REL_CXXFLAGS = ['-O2', '-DNDEBUG']
C_WARN = [] C_WARN = []
CC_WARN = [] CC_WARN = []
CXX_WARN = []
LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid' LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid'

8
extern/verse/dist/SConstruct vendored
View File

@@ -56,7 +56,7 @@ else:
platform_linkflags += ['/DEBUG','/PDB:verse.pdb'] platform_linkflags += ['/DEBUG','/PDB:verse.pdb']
verse_env = env.Copy() verse_env = env.Clone()
cmd_gen_files = (['v_cmd_gen.c', cmd_gen_files = (['v_cmd_gen.c',
'v_cmd_def_a.c', 'v_cmd_def_a.c',
@@ -71,7 +71,7 @@ cmd_gen_files = (['v_cmd_gen.c',
cmd_gen_deps = (['v_gen_pack_init.c']) cmd_gen_deps = (['v_gen_pack_init.c'])
proto_env = env.Copy() proto_env = env.Clone()
proto_env.Append(CPPDEFINES=['V_GENERATE_FUNC_MODE']) proto_env.Append(CPPDEFINES=['V_GENERATE_FUNC_MODE'])
mkprot_tool = proto_env.Program(target = 'mkprot', source = cmd_gen_files) mkprot_tool = proto_env.Program(target = 'mkprot', source = cmd_gen_files)
@@ -130,10 +130,10 @@ server_source_files = (['vs_connection.c',
'vs_node_text.c' 'vs_node_text.c'
]) ])
verselib_env = verse_env.Copy() verselib_env = verse_env.Clone()
verselib_env.Append(CPPDEFINES = defines) verselib_env.Append(CPPDEFINES = defines)
verseserver_env = verse_env.Copy() verseserver_env = verse_env.Clone()
verseserver_env.Append(CPPDEFINES = defines) verseserver_env.Append(CPPDEFINES = defines)
verseserver_env.Append (LIBPATH = ['.']) verseserver_env.Append (LIBPATH = ['.'])
verseserver_env.Append (LIBS= ['verse']) verseserver_env.Append (LIBS= ['verse'])

4
source/blender/makesdna/intern/SConscript
View File

@@ -10,8 +10,8 @@ root_build_dir=env['BF_BUILDDIR']
source_files = ['makesdna.c'] source_files = ['makesdna.c']
header_files = env.Glob('../*.h') header_files = env.Glob('../*.h')
makesdna_tool = env.Copy() makesdna_tool = env.Clone()
dna = env.Copy() dna = env.Clone()
makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ') makesdna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesdna/\\"" ')
makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc', makesdna_tool.Append (CPPPATH = ['#/intern/guardedalloc',

3
source/gameengine/Physics/Sumo/SConscript
View File

@@ -1,7 +1,6 @@
#!/usr/bin/python #!/usr/bin/python
Import ('env') Import ('env')
sumoenv = env.Copy()
sources = ['SumoPHYCallbackBridge.cpp', sources = ['SumoPHYCallbackBridge.cpp',
'SumoPhysicsController.cpp', 'SumoPhysicsController.cpp',
'SumoPhysicsEnvironment.cpp', 'SumoPhysicsEnvironment.cpp',
@@ -16,7 +15,7 @@ incs =['.',
'Fuzzics/include', 'Fuzzics/include',
'#/intern/moto/include' '#/intern/moto/include'
] ]
incs += [sumoenv['BF_SOLID_INC']] incs += [env['BF_SOLID_INC']]
cflags = [] cflags = []
if env['OURPLATFORM']=='win32-vc': if env['OURPLATFORM']=='win32-vc':

37
tools/Blender.py
View File

@@ -394,13 +394,13 @@ class BlenderEnvironment(SConsEnvironment):
self.Exit() self.Exit()
print bc.HEADER+'Configuring resource '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC print bc.HEADER+'Configuring resource '+bc.ENDC+bc.OKGREEN+libname+bc.ENDC
lenv = self.Copy() lenv = self.Clone()
res = lenv.RES('#'+root_build_dir+'lib/'+libname, source) res = lenv.RES('#'+root_build_dir+'lib/'+libname, source)
SConsEnvironment.Default(self, res) SConsEnvironment.Default(self, res)
resources.append(res) resources.append(res)
def BlenderLib(self=None, libname=None, sources=None, includes=[], defines=[], libtype='common', priority = 100, compileflags=None): def BlenderLib(self=None, libname=None, sources=None, includes=[], defines=[], libtype='common', priority = 100, compileflags=None, cc_compileflags=None, cxx_compileflags=None):
if not self or not libname or not sources: if not self or not libname or not sources:
print bc.FAIL+'Cannot continue. Missing argument for BuildBlenderLib '+libname+bc.ENDC print bc.FAIL+'Cannot continue. Missing argument for BuildBlenderLib '+libname+bc.ENDC
self.Exit() self.Exit()
@@ -409,7 +409,7 @@ class BlenderEnvironment(SConsEnvironment):
print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname +bc.ENDC+bc.OKBLUE+ " (debug mode)" + bc.ENDC print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname +bc.ENDC+bc.OKBLUE+ " (debug mode)" + bc.ENDC
else: else:
print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname + bc.ENDC print bc.HEADER+'Configuring library '+bc.ENDC+bc.OKGREEN+libname + bc.ENDC
lenv = self.Copy() lenv = self.Clone()
lenv.Append(CPPPATH=includes) lenv.Append(CPPPATH=includes)
lenv.Append(CPPDEFINES=defines) lenv.Append(CPPDEFINES=defines)
if lenv['WITH_BF_GAMEENGINE']: if lenv['WITH_BF_GAMEENGINE']:
@@ -419,21 +419,28 @@ class BlenderEnvironment(SConsEnvironment):
# debug or not # debug or not
# CXXFLAGS defaults to CCFLAGS, therefore # CXXFLAGS defaults to CCFLAGS, therefore
# we Replace() rather than Append() to CXXFLAGS the first time # we Replace() rather than Append() to CXXFLAGS the first time
lenv.Replace(CXXFLAGS = lenv['CCFLAGS']) #lenv.Replace(CXXFLAGS = lenv['CCFLAGS'])
if lenv['BF_DEBUG'] or (libname in quickdebug): if lenv['BF_DEBUG'] or (libname in quickdebug):
lenv.Append(CCFLAGS = Split(lenv['BF_DEBUG_FLAGS'])) lenv.Append(CFLAGS = Split(lenv['BF_DEBUG_CFLAGS']))
lenv.Append( CXXFLAGS = Split(lenv['BF_DEBUG_FLAGS'])) lenv.Append(CCFLAGS = Split(lenv['BF_DEBUG_CCFLAGS']))
lenv.Append(CXXFLAGS = Split(lenv['BF_DEBUG_CXXFLAGS']))
else: else:
lenv.Append(CCFLAGS = lenv['REL_CFLAGS']) lenv.Append(CFLAGS = lenv['REL_CFLAGS'])
lenv.Append(CXXFLAGS = lenv['REL_CCFLAGS']) lenv.Append(CCFLAGS = lenv['REL_CCFLAGS'])
lenv.Append(CXXFLAGS = lenv['REL_CXXFLAGS'])
if lenv['BF_PROFILE']: if lenv['BF_PROFILE']:
lenv.Append(CCFLAGS = Split(lenv['BF_PROFILE_FLAGS']), lenv.Append(CFLAGS = lenv['BF_PROFILE_CFLAGS'])
CXXFLAGS = Split(lenv['BF_PROFILE_FLAGS'])) lenv.Append(CCFLAGS = lenv['BF_PROFILE_CCFLAGS'])
lenv.Append(CXXFLAGS = lenv['BF_PROFILE_CXXFLAGS'])
if compileflags: if compileflags:
lenv.Append(CCFLAGS = compileflags) lenv.Append(CFLAGS = compileflags)
lenv.Append(CXXFLAGS = compileflags) if cc_compileflags:
lenv.Append(CCFLAGS = Split(lenv['C_WARN'])) lenv.Append(CCFLAGS = cc_compileflags)
lenv.Append(CXXFLAGS = Split(lenv['CC_WARN'])) if cxx_compileflags:
lenv.Append(CXXFLAGS = cxx_compileflags)
lenv.Append(CFLAGS = lenv['C_WARN'])
lenv.Append(CXXFLAGS = lenv['CC_WARN'])
lenv.Append(CXXFLAGS = lenv['CXX_WARN'])
lib = lenv.Library(target= '#'+root_build_dir+'lib/'+libname, source=sources) lib = lenv.Library(target= '#'+root_build_dir+'lib/'+libname, source=sources)
SConsEnvironment.Default(self, lib) # we add to default target, because this way we get some kind of progress info during build SConsEnvironment.Default(self, lib) # we add to default target, because this way we get some kind of progress info during build
else: else:
@@ -443,7 +450,7 @@ class BlenderEnvironment(SConsEnvironment):
def BlenderProg(self=None, builddir=None, progname=None, sources=None, includes=None, libs=None, libpath=None, binarykind=''): 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 print bc.HEADER+'Configuring program '+bc.ENDC+bc.OKGREEN+progname+bc.ENDC
lenv = self.Copy() lenv = self.Clone()
if lenv['OURPLATFORM'] in ['win32-vc', 'cygwin']: if lenv['OURPLATFORM'] in ['win32-vc', 'cygwin']:
lenv.Append(LINKFLAGS = Split(lenv['PLATFORM_LINKFLAGS'])) lenv.Append(LINKFLAGS = Split(lenv['PLATFORM_LINKFLAGS']))
if lenv['BF_DEBUG']: if lenv['BF_DEBUG']:

136
tools/btools.py
View File

@@ -2,10 +2,8 @@
import os import os
import os.path import os.path
import SCons.Options import SCons.Options
try:
import SCons.Options.BoolOption import SCons.Variables
except ImportError:
pass
try: try:
import subprocess import subprocess
except ImportError: except ImportError:
@@ -15,8 +13,8 @@ import glob
import shutil import shutil
import sys import sys
Options = SCons.Options Variables = SCons.Variables
BoolOption = SCons.Options.BoolOption BoolVariable = SCons.Variables.BoolVariable
def print_arguments(args, bc): def print_arguments(args, bc):
if len(args): if len(args):
@@ -54,10 +52,13 @@ def validate_arguments(args, bc):
'WITH_BF_PLAYER', 'WITH_BF_PLAYER',
'WITH_BF_NOBLENDER', 'WITH_BF_NOBLENDER',
'WITH_BF_BINRELOC', 'WITH_BF_BINRELOC',
'CFLAGS', 'CCFLAGS', 'CPPFLAGS', 'CFLAGS', 'CCFLAGS', 'CXXFLAGS', 'CPPFLAGS',
'REL_CFLAGS', 'REL_CCFLAGS', 'REL_CFLAGS', 'REL_CCFLAGS', 'REL_CXXFLAGS',
'C_WARN', 'CC_WARN', 'LLIBS', 'PLATFORM_LINKFLAGS', 'BF_PROFILE_FLAGS', 'BF_PROFILE_FLAGS', 'BF_PROFILE_CXXFLAGS',
'BF_PROFILE_FLAGS', 'LCGDIR', 'BF_DEBUG_CFLAGS', 'BF_DEBUG_CCFLAGS', 'BF_DEBUG_CXXFLAGS',
'C_WARN', 'CC_WARN', 'CXX_WARN',
'LLIBS', 'PLATFORM_LINKFLAGS',
'LCGDIR',
'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC' 'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC'
'WITH_BF_VERSE', 'BF_VERSE_INCLUDE', 'WITH_BF_VERSE', 'BF_VERSE_INCLUDE',
'VERSE_BUILD_BINARY', 'VERSE_BUILD_DIR', 'VERSE_REGEN_PROTO', 'VERSE_BUILD_BINARY', 'VERSE_BUILD_DIR', 'VERSE_REGEN_PROTO',
@@ -69,12 +70,13 @@ def validate_arguments(args, bc):
'BF_X264_CONFIG', 'BF_X264_CONFIG',
'BF_XVIDCORE_CONFIG', 'BF_XVIDCORE_CONFIG',
'WITH_BF_DOCS', 'WITH_BF_DOCS',
'BF_NUMJOBS',
] ]
arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE', arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME', 'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME',
'BF_BUILDDIR', 'BF_FANCY', 'BF_QUICK', 'BF_PROFILE', 'BF_BUILDDIR', 'BF_FANCY', 'BF_QUICK', 'BF_PROFILE',
'BF_DEBUG_FLAGS', 'BF_BSC', 'BF_CONFIG', 'BF_BSC', 'BF_CONFIG',
'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX', 'BF_QUICKDEBUG', 'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX', 'BF_QUICKDEBUG',
'BF_LISTDEBUG', 'LCGDIR', 'BF_X264_CONFIG', 'BF_XVIDCORE_CONFIG', 'BF_LISTDEBUG', 'LCGDIR', 'BF_X264_CONFIG', 'BF_XVIDCORE_CONFIG',
'BF_DOCDIR'] 'BF_DOCDIR']
@@ -132,12 +134,12 @@ def SetupSpawn( env ):
def read_opts(cfg, args): def read_opts(cfg, args):
localopts = Options.Options(cfg, args) localopts = Variables.Variables(cfg, args)
localopts.AddOptions( localopts.AddVariables(
('VERSE_BUILD_BINARY', 'Build a release or debug binary.', 'release'), ('VERSE_BUILD_BINARY', 'Build a release or debug binary.', 'release'),
('VERSE_BUILD_DIR', 'Target directory for intermediate files.', "${BF_BUILDDIR}/extern/verse"), ('VERSE_BUILD_DIR', 'Target directory for intermediate files.', "${BF_BUILDDIR}/extern/verse"),
('VERSE_REGEN_PROTO', 'Whether to regenerate the protocol files', 'yes'), ('VERSE_REGEN_PROTO', 'Whether to regenerate the protocol files', 'yes'),
(BoolOption('WITH_BF_VERSE', 'Use VERSE if true', False)), (BoolVariable('WITH_BF_VERSE', 'Use VERSE if true', False)),
('BF_VERSE_INCLUDE', 'verse include dir', '/usr/include'), ('BF_VERSE_INCLUDE', 'verse include dir', '/usr/include'),
('LCGDIR', 'location of cvs lib dir'), ('LCGDIR', 'location of cvs lib dir'),
('VERSE_BUILD_BINARY', 'Build a release or debug binary.', 'release'), ('VERSE_BUILD_BINARY', 'Build a release or debug binary.', 'release'),
@@ -145,7 +147,7 @@ def read_opts(cfg, args):
('VERSE_REGEN_PROTO', 'Whether to regenerate the protocol files', 'yes'), ('VERSE_REGEN_PROTO', 'Whether to regenerate the protocol files', 'yes'),
('BF_DEBUG_LIBS', 'list of libraries to build with debug symbols'), ('BF_DEBUG_LIBS', 'list of libraries to build with debug symbols'),
(BoolOption('WITH_BF_PYTHON', 'Compile with python', True)), (BoolVariable('WITH_BF_PYTHON', 'Compile with python', True)),
('BF_PYTHON', 'base path for python', ''), ('BF_PYTHON', 'base path for python', ''),
('BF_PYTHON_VERSION', 'Python version to use', ''), ('BF_PYTHON_VERSION', 'Python version to use', ''),
('BF_PYTHON_INC', 'include path for Python headers', ''), ('BF_PYTHON_INC', 'include path for Python headers', ''),
@@ -154,20 +156,20 @@ def read_opts(cfg, args):
('BF_PYTHON_LIB_STATIC', 'Python static libraries', ''), ('BF_PYTHON_LIB_STATIC', 'Python static libraries', ''),
('BF_PYTHON_LIBPATH', 'Library path', ''), ('BF_PYTHON_LIBPATH', 'Library path', ''),
('BF_PYTHON_LINKFLAGS', 'Python link flags', ''), ('BF_PYTHON_LINKFLAGS', 'Python link flags', ''),
(BoolOption('WITH_BF_STATICPYTHON', 'Staticly link to python', False)), (BoolVariable('WITH_BF_STATICPYTHON', 'Staticly link to python', False)),
(BoolOption('BF_NO_ELBEEM', 'Disable Fluid Sim', False)), (BoolVariable('BF_NO_ELBEEM', 'Disable Fluid Sim', False)),
(BoolOption('WITH_BF_YAFRAY', 'Enable Yafray', True)), (BoolVariable('WITH_BF_YAFRAY', 'Enable Yafray', True)),
(BoolOption('WITH_BF_OPENAL', 'Use OpenAL if true', False)), (BoolVariable('WITH_BF_OPENAL', 'Use OpenAL if true', False)),
('BF_OPENAL', 'base path for OpenAL', ''), ('BF_OPENAL', 'base path for OpenAL', ''),
('BF_OPENAL_INC', 'include path for python headers', ''), ('BF_OPENAL_INC', 'include path for python headers', ''),
('BF_OPENAL_LIB', 'Path to OpenAL library', ''), ('BF_OPENAL_LIB', 'Path to OpenAL library', ''),
('BF_OPENAL_LIB_STATIC', 'Path to OpenAL static library', ''), ('BF_OPENAL_LIB_STATIC', 'Path to OpenAL static library', ''),
('BF_OPENAL_LIBPATH', 'Path to OpenAL library', ''), ('BF_OPENAL_LIBPATH', 'Path to OpenAL library', ''),
(BoolOption('WITH_BF_STATICOPENAL', 'Staticly link to openal', False)), (BoolVariable('WITH_BF_STATICOPENAL', 'Staticly link to openal', False)),
(BoolOption('WITH_BF_SDL', 'Use SDL if true', False)), (BoolVariable('WITH_BF_SDL', 'Use SDL if true', False)),
('BF_SDL', 'SDL base path', ''), ('BF_SDL', 'SDL base path', ''),
('BF_SDL_INC', 'SDL include path', ''), #$(shell $(BF_SDL)/bin/sdl-config --cflags) ('BF_SDL_INC', 'SDL include path', ''), #$(shell $(BF_SDL)/bin/sdl-config --cflags)
('BF_SDL_LIB', 'SDL library', ''), #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer ('BF_SDL_LIB', 'SDL library', ''), #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
@@ -178,20 +180,20 @@ def read_opts(cfg, args):
('BF_PTHREADS_LIB', 'Pthreads library', ''), ('BF_PTHREADS_LIB', 'Pthreads library', ''),
('BF_PTHREADS_LIBPATH', 'Pthreads library path', ''), ('BF_PTHREADS_LIBPATH', 'Pthreads library path', ''),
(BoolOption('WITH_BF_FMOD', 'Use FMOD if true', False)), (BoolVariable('WITH_BF_FMOD', 'Use FMOD if true', False)),
# BF_FMOD = $(LCGDIR)/fmod # BF_FMOD = $(LCGDIR)/fmod
(BoolOption('WITH_BF_OPENEXR', 'Use OPENEXR if true', True)), (BoolVariable('WITH_BF_OPENEXR', 'Use OPENEXR if true', True)),
(BoolOption('WITH_BF_STATICOPENEXR', 'Staticly link to OpenEXR', False)), (BoolVariable('WITH_BF_STATICOPENEXR', 'Staticly link to OpenEXR', False)),
('BF_OPENEXR', 'OPENEXR base path', ''), ('BF_OPENEXR', 'OPENEXR base path', ''),
('BF_OPENEXR_INC', 'OPENEXR include path', ''), ('BF_OPENEXR_INC', 'OPENEXR include path', ''),
('BF_OPENEXR_LIB', 'OPENEXR library', ''), ('BF_OPENEXR_LIB', 'OPENEXR library', ''),
('BF_OPENEXR_LIBPATH', 'OPENEXR library path', ''), ('BF_OPENEXR_LIBPATH', 'OPENEXR library path', ''),
('BF_OPENEXR_LIB_STATIC', 'OPENEXR static library', ''), ('BF_OPENEXR_LIB_STATIC', 'OPENEXR static library', ''),
(BoolOption('WITH_BF_DDS', 'Use DDS if true', True)), (BoolVariable('WITH_BF_DDS', 'Use DDS if true', True)),
(BoolOption('WITH_BF_FFMPEG', 'Use FFMPEG if true', False)), (BoolVariable('WITH_BF_FFMPEG', 'Use FFMPEG if true', False)),
('BF_FFMPEG', 'FFMPEG base path', ''), ('BF_FFMPEG', 'FFMPEG base path', ''),
('BF_FFMPEG_LIB', 'FFMPEG library', ''), ('BF_FFMPEG_LIB', 'FFMPEG library', ''),
('BF_FFMPEG_EXTRA', 'FFMPEG flags that must be preserved', ''), ('BF_FFMPEG_EXTRA', 'FFMPEG flags that must be preserved', ''),
@@ -199,30 +201,30 @@ def read_opts(cfg, args):
('BF_FFMPEG_INC', 'FFMPEG includes', ''), ('BF_FFMPEG_INC', 'FFMPEG includes', ''),
('BF_FFMPEG_LIBPATH', 'FFMPEG library path', ''), ('BF_FFMPEG_LIBPATH', 'FFMPEG library path', ''),
(BoolOption('WITH_BF_OGG', 'Use OGG, THEORA, VORBIS in FFMPEG if true', (BoolVariable('WITH_BF_OGG', 'Use OGG, THEORA, VORBIS in FFMPEG if true',
False)), False)),
('BF_OGG', 'OGG base path', ''), ('BF_OGG', 'OGG base path', ''),
('BF_OGG_LIB', 'OGG library', ''), ('BF_OGG_LIB', 'OGG library', ''),
(BoolOption('WITH_BF_JPEG', 'Use JPEG if true', True)), (BoolVariable('WITH_BF_JPEG', 'Use JPEG if true', True)),
('BF_JPEG', 'JPEG base path', ''), ('BF_JPEG', 'JPEG base path', ''),
('BF_JPEG_INC', 'JPEG include path', ''), ('BF_JPEG_INC', 'JPEG include path', ''),
('BF_JPEG_LIB', 'JPEG library', ''), ('BF_JPEG_LIB', 'JPEG library', ''),
('BF_JPEG_LIBPATH', 'JPEG library path', ''), ('BF_JPEG_LIBPATH', 'JPEG library path', ''),
(BoolOption('WITH_BF_OPENJPEG', 'Use OPENJPEG if true', False)), (BoolVariable('WITH_BF_OPENJPEG', 'Use OPENJPEG if true', False)),
('BF_OPENJPEG', 'OPENJPEG base path', ''), ('BF_OPENJPEG', 'OPENJPEG base path', ''),
('BF_OPENJPEG_INC', 'OPENJPEG include path', ''), ('BF_OPENJPEG_INC', 'OPENJPEG include path', ''),
('BF_OPENJPEG_LIB', 'OPENJPEG library', ''), ('BF_OPENJPEG_LIB', 'OPENJPEG library', ''),
('BF_OPENJPEG_LIBPATH', 'OPENJPEG library path', ''), ('BF_OPENJPEG_LIBPATH', 'OPENJPEG library path', ''),
(BoolOption('WITH_BF_REDCODE', 'Use REDCODE if true', False)), (BoolVariable('WITH_BF_REDCODE', 'Use REDCODE if true', False)),
('BF_REDCODE', 'REDCODE base path', ''), ('BF_REDCODE', 'REDCODE base path', ''),
('BF_REDCODE_INC', 'REDCODE include path', ''), ('BF_REDCODE_INC', 'REDCODE include path', ''),
('BF_REDCODE_LIB', 'REDCODE library', ''), ('BF_REDCODE_LIB', 'REDCODE library', ''),
('BF_REDCODE_LIBPATH', 'REDCODE library path', ''), ('BF_REDCODE_LIBPATH', 'REDCODE library path', ''),
(BoolOption('WITH_BF_PNG', 'Use PNG if true', True)), (BoolVariable('WITH_BF_PNG', 'Use PNG if true', True)),
('BF_PNG', 'PNG base path', ''), ('BF_PNG', 'PNG base path', ''),
('BF_PNG_INC', 'PNG include path', ''), ('BF_PNG_INC', 'PNG include path', ''),
('BF_PNG_LIB', 'PNG library', ''), ('BF_PNG_LIB', 'PNG library', ''),
@@ -231,33 +233,33 @@ def read_opts(cfg, args):
('BF_TIFF', 'TIFF base path', ''), ('BF_TIFF', 'TIFF base path', ''),
('BF_TIFF_INC', 'TIFF include path', ''), ('BF_TIFF_INC', 'TIFF include path', ''),
(BoolOption('WITH_BF_ZLIB', 'Use ZLib if true', True)), (BoolVariable('WITH_BF_ZLIB', 'Use ZLib if true', True)),
('BF_ZLIB', 'ZLib base path', ''), ('BF_ZLIB', 'ZLib base path', ''),
('BF_ZLIB_INC', 'ZLib include path', ''), ('BF_ZLIB_INC', 'ZLib include path', ''),
('BF_ZLIB_LIB', 'ZLib library', ''), ('BF_ZLIB_LIB', 'ZLib library', ''),
('BF_ZLIB_LIBPATH', 'ZLib library path', ''), ('BF_ZLIB_LIBPATH', 'ZLib library path', ''),
(BoolOption('WITH_BF_INTERNATIONAL', 'Use Gettext and Freetype if true', True)), (BoolVariable('WITH_BF_INTERNATIONAL', 'Use Gettext and Freetype if true', True)),
('BF_GETTEXT', 'gettext base path', ''), ('BF_GETTEXT', 'gettext base path', ''),
('BF_GETTEXT_INC', 'gettext include path', ''), ('BF_GETTEXT_INC', 'gettext include path', ''),
('BF_GETTEXT_LIB', 'gettext library', ''), ('BF_GETTEXT_LIB', 'gettext library', ''),
('BF_GETTEXT_LIBPATH', 'gettext library path', ''), ('BF_GETTEXT_LIBPATH', 'gettext library path', ''),
(BoolOption('WITH_BF_ICONV', 'Use iconv if true', True)), (BoolVariable('WITH_BF_ICONV', 'Use iconv if true', True)),
('BF_ICONV', 'iconv base path', ''), ('BF_ICONV', 'iconv base path', ''),
('BF_ICONV_INC', 'iconv include path', ''), ('BF_ICONV_INC', 'iconv include path', ''),
('BF_ICONV_LIB', 'iconv library', ''), ('BF_ICONV_LIB', 'iconv library', ''),
('BF_ICONV_LIBPATH', 'iconv library path', ''), ('BF_ICONV_LIBPATH', 'iconv library path', ''),
(BoolOption('WITH_BF_GAMEENGINE', 'Build with gameengine' , True)), (BoolVariable('WITH_BF_GAMEENGINE', 'Build with gameengine' , True)),
(BoolOption('WITH_BF_ODE', 'Use ODE if true', True)), (BoolVariable('WITH_BF_ODE', 'Use ODE if true', True)),
('BF_ODE', 'ODE base path', ''), ('BF_ODE', 'ODE base path', ''),
('BF_ODE_INC', 'ODE include path' , ''), ('BF_ODE_INC', 'ODE include path' , ''),
('BF_ODE_LIB', 'ODE library', ''), ('BF_ODE_LIB', 'ODE library', ''),
(BoolOption('WITH_BF_BULLET', 'Use Bullet if true', True)), (BoolVariable('WITH_BF_BULLET', 'Use Bullet if true', True)),
('BF_BULLET', 'Bullet base dir', ''), ('BF_BULLET', 'Bullet base dir', ''),
('BF_BULLET_INC', 'Bullet include path', ''), ('BF_BULLET_INC', 'Bullet include path', ''),
('BF_BULLET_LIB', 'Bullet library', ''), ('BF_BULLET_LIB', 'Bullet library', ''),
@@ -267,7 +269,7 @@ def read_opts(cfg, args):
('BF_WINTAB', 'WinTab base dir', ''), ('BF_WINTAB', 'WinTab base dir', ''),
('BF_WINTAB_INC', 'WinTab include dir', ''), ('BF_WINTAB_INC', 'WinTab include dir', ''),
('BF_CXX', 'c++ base path for libstdc++, only used when static linking', ''), ('BF_CXX', 'c++ base path for libstdc++, only used when static linking', ''),
(BoolOption('WITH_BF_STATICCXX', 'static link to stdc++', False)), (BoolVariable('WITH_BF_STATICCXX', 'static link to stdc++', False)),
('BF_CXX_LIB_STATIC', 'static library path for stdc++', ''), ('BF_CXX_LIB_STATIC', 'static library path for stdc++', ''),
## ##
##WITH_BF_NSPR = True ##WITH_BF_NSPR = True
@@ -287,21 +289,21 @@ def read_opts(cfg, args):
##BF_PARANOID = True ##BF_PARANOID = True
## ##
### enable freetype2 support for text objects ### enable freetype2 support for text objects
(BoolOption('WITH_BF_FREETYPE', 'Use FreeType2 if true', False)), (BoolVariable('WITH_BF_FREETYPE', 'Use FreeType2 if true', False)),
('BF_FREETYPE', 'Freetype base path', ''), ('BF_FREETYPE', 'Freetype base path', ''),
('BF_FREETYPE_INC', 'Freetype include path', ''), ('BF_FREETYPE_INC', 'Freetype include path', ''),
('BF_FREETYPE_LIB', 'Freetype library', ''), ('BF_FREETYPE_LIB', 'Freetype library', ''),
('BF_FREETYPE_LIBPATH', 'Freetype library path', ''), ('BF_FREETYPE_LIBPATH', 'Freetype library path', ''),
(BoolOption('WITH_BF_OPENMP', 'Use OpenMP if true', False)), (BoolVariable('WITH_BF_OPENMP', 'Use OpenMP if true', False)),
(BoolOption('WITH_BF_QUICKTIME', 'Use QuickTime if true', False)), (BoolVariable('WITH_BF_QUICKTIME', 'Use QuickTime if true', False)),
('BF_QUICKTIME', 'QuickTime base path', ''), ('BF_QUICKTIME', 'QuickTime base path', ''),
('BF_QUICKTIME_INC', 'QuickTime include path', ''), ('BF_QUICKTIME_INC', 'QuickTime include path', ''),
('BF_QUICKTIME_LIB', 'QuickTime library', ''), ('BF_QUICKTIME_LIB', 'QuickTime library', ''),
('BF_QUICKTIME_LIBPATH', 'QuickTime library path', ''), ('BF_QUICKTIME_LIBPATH', 'QuickTime library path', ''),
(BoolOption('WITH_BF_STATICOPENGL', 'Use MESA if true', True)), (BoolVariable('WITH_BF_STATICOPENGL', 'Use MESA if true', True)),
('BF_OPENGL', 'OpenGL base path', ''), ('BF_OPENGL', 'OpenGL base path', ''),
('BF_OPENGL_INC', 'OpenGL include path', ''), ('BF_OPENGL_INC', 'OpenGL include path', ''),
('BF_OPENGL_LIB', 'OpenGL libraries', ''), ('BF_OPENGL_LIB', 'OpenGL libraries', ''),
@@ -309,33 +311,40 @@ def read_opts(cfg, args):
('BF_OPENGL_LIB_STATIC', 'OpenGL static libraries', ''), ('BF_OPENGL_LIB_STATIC', 'OpenGL static libraries', ''),
('BF_OPENGL_LINKFLAGS', 'OpenGL link flags', ''), ('BF_OPENGL_LINKFLAGS', 'OpenGL link flags', ''),
(BoolOption('WITH_BF_FTGL', 'Use FTGL if true', True)), (BoolVariable('WITH_BF_FTGL', 'Use FTGL if true', True)),
('BF_FTGL', 'FTGL base path', ''), ('BF_FTGL', 'FTGL base path', ''),
('BF_FTGL_INC', 'FTGL include path', ''), ('BF_FTGL_INC', 'FTGL include path', ''),
('BF_FTGL_LIB', 'FTGL libraries', ''), ('BF_FTGL_LIB', 'FTGL libraries', ''),
(BoolOption('WITH_BF_PLAYER', 'Build blenderplayer if true', False)), (BoolVariable('WITH_BF_PLAYER', 'Build blenderplayer if true', False)),
(BoolOption('WITH_BF_NOBLENDER', 'Do not build blender if true', False)), (BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true', False)),
('CFLAGS', 'C-compiler flags', ''), ('CFLAGS', 'C only flags', ''),
('CCFLAGS', 'C++-compiler flags', ''), ('CCFLAGS', 'Generic C and C++ flags', ''),
('CXXFLAGS', 'C++ only flags', ''),
('CPPFLAGS', 'Defines', ''), ('CPPFLAGS', 'Defines', ''),
('REL_CFLAGS', 'C release flags', ''), ('REL_CFLAGS', 'C only release flags', ''),
('REL_CCFLAGS', 'C++ release flags', ''), ('REL_CCFLAGS', 'Generic C and C++ release flags', ''),
('REL_CXXFLAGS', 'C++ only release flags', ''),
('C_WARN', 'C warning flags', ''), ('C_WARN', 'C warning flags', ''),
('CC_WARN', 'C++ warning flags', ''), ('CC_WARN', 'Generic C and C++ warning flags', ''),
('CXX_WARN', 'C++ only warning flags', ''),
('LLIBS', 'Platform libs', ''), ('LLIBS', 'Platform libs', ''),
('PLATFORM_LINKFLAGS', 'Platform linkflags', ''), ('PLATFORM_LINKFLAGS', 'Platform linkflags', ''),
(BoolOption('BF_PROFILE', 'Add profiling information if true', False)), (BoolVariable('BF_PROFILE', 'Add profiling information if true', False)),
('BF_PROFILE_FLAGS', 'Profiling flags', ''), ('BF_PROFILE_CFLAGS', 'C only profiling flags', ''),
('BF_PROFILE_CCFLAGS', 'C and C++ profiling flags', ''),
('BF_PROFILE_CXXFLAGS', 'C++ only profiling flags', ''),
(BoolOption('BF_DEBUG', 'Add debug flags if true', False)), (BoolVariable('BF_DEBUG', 'Add debug flags if true', False)),
('BF_DEBUG_FLAGS', 'Debug flags', ''), ('BF_DEBUG_CFLAGS', 'C only debug flags', ''),
('BF_DEBUG_CCFLAGS', 'C and C++ debug flags', ''),
('BF_DEBUG_CXXFLAGS', 'C++ only debug flags', ''),
(BoolOption('BF_BSC', 'Create .bsc files (msvc only)', True)), (BoolVariable('BF_BSC', 'Create .bsc files (msvc only)', True)),
('BF_BUILDDIR', 'Build dir', ''), ('BF_BUILDDIR', 'Build dir', ''),
('BF_INSTALLDIR', 'Installation dir', ''), ('BF_INSTALLDIR', 'Installation dir', ''),
@@ -344,20 +353,21 @@ def read_opts(cfg, args):
('CC', 'C compiler to use', ''), ('CC', 'C compiler to use', ''),
('CXX', 'C++ compiler to use', ''), ('CXX', 'C++ compiler to use', ''),
(BoolOption('BF_BUILDINFO', 'Buildtime in splash if true', True)), (BoolVariable('BF_BUILDINFO', 'Buildtime in splash if true', True)),
(BoolOption('BF_TWEAK_MODE', 'Enable tweak mode if true', False)), (BoolVariable('BF_TWEAK_MODE', 'Enable tweak mode if true', False)),
(BoolOption('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)), (BoolVariable('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)),
(BoolOption('WITHOUT_BF_INSTALL', 'dont install if true', False)), (BoolVariable('WITHOUT_BF_INSTALL', 'dont install if true', False)),
(BoolOption('BF_FANCY', 'Enable fancy output if true', True)), (BoolVariable('BF_FANCY', 'Enable fancy output if true', True)),
(BoolOption('BF_QUIET', 'Enable silent output if true', True)), (BoolVariable('BF_QUIET', 'Enable silent output if true', True)),
(BoolOption('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', False)), (BoolVariable('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', False)),
('BF_X264_CONFIG', 'configuration flags for x264', ''), ('BF_X264_CONFIG', 'configuration flags for x264', ''),
('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''), ('BF_XVIDCORE_CONFIG', 'configuration flags for xvidcore', ''),
(BoolOption('WITH_BF_DOCS', 'Generate API documentation', False)), (BoolVariable('WITH_BF_DOCS', 'Generate API documentation', False)),
('BF_CONFIG', 'SCons python config file used to set default options', 'user_config.py'), ('BF_CONFIG', 'SCons python config file used to set default options', 'user_config.py'),
('BF_NUMJOBS', 'Number of build processes to spawn', '1')
) # end of opts.AddOptions() ) # end of opts.AddOptions()