kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

=== SCons ===

Browse Source 
* BlenderLib now expects lists for all compiler related flags (release, profile, debug, warn).
  I changed the default config files, but do double-check your user-config files, esp. if you did
  a full copy of an old default platform config
This commit is contained in:
Nathan Letwory 2008-11-04 22:46:43 +00:00
parent a19366f34a
commit 2d80262759
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/darwin-config.py
View File

@ -260,11 +260,11 @@ CC_WARN = ['-Wall', '-Wno-long-double']
##LOPTS = --dynamic ##LOPTS = --dynamic
##DYNLDFLAGS = -shared $(LDFLAGS) ##DYNLDFLAGS = -shared $(LDFLAGS)
BF_PROFILE_FLAGS = ' -pg -g ' BF_PROFILE_FLAGS = ['-pg', '-g ']
BF_PROFILE = False BF_PROFILE = False
BF_DEBUG = False BF_DEBUG = False
BF_DEBUG_FLAGS = '-g' BF_DEBUG_FLAGS = ['-g']
BF_BUILDDIR='../build/darwin' BF_BUILDDIR='../build/darwin'
BF_INSTALLDIR='../install/darwin' BF_INSTALLDIR='../install/darwin'

2
config/linux2-config.py
View File

@ -201,7 +201,7 @@ BF_PROFILE_FLAGS = ['-pg','-g']
BF_PROFILE = False BF_PROFILE = False
BF_DEBUG = False BF_DEBUG = False
BF_DEBUG_FLAGS = '-g' BF_DEBUG_FLAGS = ['-g']
BF_BUILDDIR = '../build/linux2' BF_BUILDDIR = '../build/linux2'
BF_INSTALLDIR='../install/linux2' BF_INSTALLDIR='../install/linux2'

2
config/linuxcross-config.py
View File

@ -144,7 +144,7 @@ CC_WARN = [ '-Wall' ]
LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread' ] LLIBS = [ '-ldxguid', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz'] #'-lutil', '-lc', '-lm', '-ldl', '-lpthread' ]
BF_DEBUG = False BF_DEBUG = False
BF_DEBUG_FLAGS= '' BF_DEBUG_FLAGS= []
BF_BUILDDIR = '../build/linuxcross' BF_BUILDDIR = '../build/linuxcross'
BF_INSTALLDIR='../install/linuxcross' BF_INSTALLDIR='../install/linuxcross'

4
config/openbsd3-config.py
View File

@ -155,11 +155,11 @@ LLIBS = 'm stdc++ pthread util'
##LOPTS = --dynamic ##LOPTS = --dynamic
##DYNLDFLAGS = -shared $(LDFLAGS) ##DYNLDFLAGS = -shared $(LDFLAGS)
BF_PROFILE_FLAGS = ' -pg -g ' BF_PROFILE_FLAGS = ['-pg', '-g']
BF_PROFILE = False BF_PROFILE = False
BF_DEBUG = False BF_DEBUG = False
BF_DEBUG_FLAGS = '-g' BF_DEBUG_FLAGS = ['-g']
BF_BUILDDIR='../build/openbsd3' BF_BUILDDIR='../build/openbsd3'
BF_INSTALLDIR='../install/openbsd3' BF_INSTALLDIR='../install/openbsd3'

4
config/sunos5-config.py
View File

@ -173,11 +173,11 @@ BF_PROFILE_FLAGS = ['-pg','-g']
BF_PROFILE = False BF_PROFILE = False
BF_DEBUG = False BF_DEBUG = False
BF_DEBUG_FLAGS = '' BF_DEBUG_FLAGS = []
BF_BUILDDIR = '../build/sunos5' BF_BUILDDIR = '../build/sunos5'
BF_INSTALLDIR='../install/sunos5' BF_INSTALLDIR='../install/sunos5'
BF_DOCDIR='../install/doc' BF_DOCDIR='../install/doc'
PLATFORM_LINKFLAGS = [''] PLATFORM_LINKFLAGS = []

2
config/win32-mingw-config.py
View File

@ -160,7 +160,7 @@ CC_WARN = [ '-Wall' ]
LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++'] LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++']
BF_DEBUG = False BF_DEBUG = False
BF_DEBUG_FLAGS= '-g' BF_DEBUG_FLAGS= ['-g']
BF_PROFILE_FLAGS = ['-pg','-g'] BF_PROFILE_FLAGS = ['-pg','-g']
BF_PROFILE = False BF_PROFILE = False

6
tools/Blender.py
View File

@ -417,9 +417,9 @@ class BlenderEnvironment(SConsEnvironment):
if lenv['WITH_BF_BULLET']: if lenv['WITH_BF_BULLET']:
lenv.Append(CPPDEFINES=['WITH_BULLET=1']) lenv.Append(CPPDEFINES=['WITH_BULLET=1'])
if lenv['BF_DEBUG'] or (libname in quickdebug): if lenv['BF_DEBUG'] or (libname in quickdebug):
lenv.Append(CFLAGS = Split(lenv['BF_DEBUG_CFLAGS'])) lenv.Append(CFLAGS = lenv['BF_DEBUG_CFLAGS'])
lenv.Append(CCFLAGS = Split(lenv['BF_DEBUG_CCFLAGS'])) lenv.Append(CCFLAGS = lenv['BF_DEBUG_CCFLAGS'])
lenv.Append(CXXFLAGS = Split(lenv['BF_DEBUG_CXXFLAGS'])) lenv.Append(CXXFLAGS = lenv['BF_DEBUG_CXXFLAGS'])
else: else:
lenv.Append(CFLAGS = lenv['REL_CFLAGS']) lenv.Append(CFLAGS = lenv['REL_CFLAGS'])
lenv.Append(CCFLAGS = lenv['REL_CCFLAGS']) lenv.Append(CCFLAGS = lenv['REL_CCFLAGS'])