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

=== SCons ===

Browse Source 
* enable TWEAK_MODE with BF_TWEAK_MODE=1 on cmd-line. Can also be specified in user-config.py
This commit is contained in:
Nathan Letwory
2007-04-05 05:14:50 +00:00
parent d31355fa24
commit 581970a640
4 changed files with 159 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SConstruct
View File

@@ -582,7 +582,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
'${LCGDIR}/zlib/lib/zlib.dll', '${LCGDIR}/zlib/lib/zlib.dll',
'${LCGDIR}/tiff/lib/libtiff.dll'] '${LCGDIR}/tiff/lib/libtiff.dll']
if env['BF_DEBUG']: if env['BF_DEBUG']:
dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}_d.dll') dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll')
else: else:
dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll') dllsources.append('${LCGDIR}/python/lib/${BF_PYTHON_LIB}.dll')
if env['OURPLATFORM'] == 'win32-mingw': if env['OURPLATFORM'] == 'win32-mingw':

3
source/blender/src/SConscript
View File

@@ -33,6 +33,9 @@ incs += ' ' + env['BF_OPENGL_INC']
defs = [] defs = []
if env['BF_TWEAK_MODE'] == 1:
defs.append('TWEAK_MODE')
if env['WITH_BF_YAFRAY'] == 0: if env['WITH_BF_YAFRAY'] == 0:
defs.append('DISABLE_YAFRAY') defs.append('DISABLE_YAFRAY')

2
tools/Blender.py
View File

@@ -142,7 +142,7 @@ def setup_syslibs(lenv):
lenv['BF_PNG_LIB'], lenv['BF_PNG_LIB'],
lenv['BF_ZLIB_LIB'] lenv['BF_ZLIB_LIB']
] ]
if lenv['BF_DEBUG'] and lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): if lenv['BF_DEBUG']==1 and lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
syslibs.append(lenv['BF_PYTHON_LIB']+'_d') syslibs.append(lenv['BF_PYTHON_LIB']+'_d')
else: else:
syslibs.append(lenv['BF_PYTHON_LIB']) syslibs.append(lenv['BF_PYTHON_LIB'])

8
tools/btools.py
View File

@@ -44,7 +44,9 @@ def validate_arguments(args, bc):
'C_WARN', 'CC_WARN', 'LLIBS', 'PLATFORM_LINKFLAGS', 'C_WARN', 'CC_WARN', 'LLIBS', 'PLATFORM_LINKFLAGS',
'BF_PROFILE_FLAGS', 'LCGDIR', 'WITH_BF_VERSE', 'BF_PROFILE_FLAGS', 'LCGDIR', 'WITH_BF_VERSE',
'BF_VERSE_INCLUDE', 'BF_VERSE_INCLUDE',
'VERSE_BUILD_BINARY', 'VERSE_BUILD_DIR', 'VERSE_REGEN_PROTO'] 'VERSE_BUILD_BINARY', 'VERSE_BUILD_DIR', 'VERSE_REGEN_PROTO',
'BF_TWEAK_MODE'
]
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',
@@ -287,7 +289,9 @@ 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')) (BoolOption('BF_BUILDINFO', 'Buildtime in splash if true', 'true')),
(BoolOption('BF_TWEAK_MODE', 'Enable tweak mode if true', 'false')),
) # end of opts.AddOptions() ) # end of opts.AddOptions()