Revision: 17492
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17492
Author: campbellbarton
Date: 2008-11-18 06:47:19 +0100 (Tue, 18 Nov 2008)
Log Message:
-----------
some scons command line args were not working since recent changes-
scons CCFLAGS="-O0 -ggdp3"
for example would pass on the args including the "'s to scons, causing the
build to fail.
Modified Paths:
--------------
trunk/blender/SConstruct
trunk/blender/config/darwin-config.py
trunk/blender/config/linux2-config.py
trunk/blender/config/openbsd3-config.py
trunk/blender/config/sunos5-config.py
trunk/blender/config/win32-vc-config.py
trunk/blender/tools/Blender.py
trunk/blender/tools/btools.py
Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct 2008-11-18 03:28:50 UTC (rev 17491)
+++ trunk/blender/SConstruct 2008-11-18 05:47:19 UTC (rev 17492)
@@ -249,7 +249,7 @@
# 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'
Modified: trunk/blender/config/darwin-config.py
===================================================================
--- trunk/blender/config/darwin-config.py 2008-11-18 03:28:50 UTC (rev
17491)
+++ trunk/blender/config/darwin-config.py 2008-11-18 05:47:19 UTC (rev
17492)
@@ -216,14 +216,14 @@
PLATFORM_LINKFLAGS = '-fexceptions -framework CoreServices -framework
Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL
-framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework
QuickTime'
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding
the SystemStubs.a lib from 10.4
-LLIBS = 'stdc++ SystemStubs'
+LLIBS = ['stdc++', 'SystemStubs']
# some flags shuffling for different Os versions
if MAC_MIN_VERS == '10.3':
CFLAGS = ['-fuse-cxa-atexit']+CFLAGS
CXXFLAGS = ['-fuse-cxa-atexit']+CXXFLAGS
PLATFORM_LINKFLAGS = '-fuse-cxa-atexit '+PLATFORM_LINKFLAGS
- LLIBS = LLIBS + ' crt3.o'
+ LLIBS.append('crt3.o')
if USE_SDK==True:
SDK_FLAGS=['-isysroot',
MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS]
Modified: trunk/blender/config/linux2-config.py
===================================================================
--- trunk/blender/config/linux2-config.py 2008-11-18 03:28:50 UTC (rev
17491)
+++ trunk/blender/config/linux2-config.py 2008-11-18 05:47:19 UTC (rev
17492)
@@ -193,7 +193,7 @@
##FIX_STUBS_WARNINGS = -Wno-unused
-LLIBS = 'util c m dl pthread stdc++'
+LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
##LOPTS = --dynamic
##DYNLDFLAGS = -shared $(LDFLAGS)
Modified: trunk/blender/config/openbsd3-config.py
===================================================================
--- trunk/blender/config/openbsd3-config.py 2008-11-18 03:28:50 UTC (rev
17491)
+++ trunk/blender/config/openbsd3-config.py 2008-11-18 05:47:19 UTC (rev
17492)
@@ -151,7 +151,7 @@
##FIX_STUBS_WARNINGS = -Wno-unused
-LLIBS = 'm stdc++ pthread util'
+LLIBS = ['m', 'stdc++', 'pthread', 'util']
##LOPTS = --dynamic
##DYNLDFLAGS = -shared $(LDFLAGS)
Modified: trunk/blender/config/sunos5-config.py
===================================================================
--- trunk/blender/config/sunos5-config.py 2008-11-18 03:28:50 UTC (rev
17491)
+++ trunk/blender/config/sunos5-config.py 2008-11-18 05:47:19 UTC (rev
17492)
@@ -165,7 +165,7 @@
##FIX_STUBS_WARNINGS = -Wno-unused
-LLIBS = 'c m dl pthread stdc++'
+LLIBS = ['c', 'm', 'dl', 'pthread', 'stdc++']
##LOPTS = --dynamic
##DYNLDFLAGS = -shared $(LDFLAGS)
Modified: trunk/blender/config/win32-vc-config.py
===================================================================
--- trunk/blender/config/win32-vc-config.py 2008-11-18 03:28:50 UTC (rev
17491)
+++ trunk/blender/config/win32-vc-config.py 2008-11-18 05:47:19 UTC (rev
17492)
@@ -181,7 +181,7 @@
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']
PLATFORM_LINKFLAGS = '''
/SUBSYSTEM:CONSOLE
Modified: trunk/blender/tools/Blender.py
===================================================================
--- trunk/blender/tools/Blender.py 2008-11-18 03:28:50 UTC (rev 17491)
+++ trunk/blender/tools/Blender.py 2008-11-18 05:47:19 UTC (rev 17492)
@@ -190,7 +190,7 @@
if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross'):
syslibs += Split(lenv['BF_PTHREADS_LIB'])
- syslibs += Split(lenv['LLIBS'])
+ syslibs += lenv['LLIBS']
return syslibs
Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py 2008-11-18 03:28:50 UTC (rev 17491)
+++ trunk/blender/tools/btools.py 2008-11-18 05:47:19 UTC (rev 17492)
@@ -19,13 +19,15 @@
def print_arguments(args, bc):
if len(args):
for k,v in args.iteritems():
+ if type(v)==list:
+ v = ' '.join(v)
print '\t'+bc.OKBLUE+k+bc.ENDC+' = '+bc.OKGREEN + v +
bc.ENDC
else:
print '\t'+bc.WARNING+'No command-line arguments given'+bc.ENDC
def validate_arguments(args, bc):
opts_list = [
- 'WITH_BF_PYTHON', '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_PYTHON', 'BF_PYTHON', 'BF_PYTHON_VERSION',
'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH',
'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',
@@ -47,17 +49,11 @@
'WITH_BF_YAFRAY',
'WITH_BF_FREETYPE', 'BF_FREETYPE', 'BF_FREETYPE_INC',
'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH',
'WITH_BF_QUICKTIME', 'BF_QUICKTIME',
'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH',
- 'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC',
'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC',
'BF_OPENGL_LINKFLAGS',
+ 'WITH_BF_STATICOPENGL', 'BF_OPENGL', 'BF_OPENGL_INC',
'BF_OPENGL_LIB', 'BF_OPENGL_LIBPATH', 'BF_OPENGL_LIB_STATIC',
'WITH_BF_FTGL', 'BF_FTGL', 'BF_FTGL_INC', 'BF_FTGL_LIB',
'WITH_BF_PLAYER',
'WITH_BF_NOBLENDER',
'WITH_BF_BINRELOC',
- 'CFLAGS', 'CCFLAGS', 'CXXFLAGS', 'CPPFLAGS',
- 'REL_CFLAGS', 'REL_CCFLAGS', 'REL_CXXFLAGS',
- 'BF_PROFILE_CFLAGS', 'BF_PROFILE_CCFLAGS',
'BF_PROFILE_CXXFLAGS', 'BF_PROFILE_LINKFLAGS',
- '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',
'WITH_BF_VERSE', 'BF_VERSE_INCLUDE',
@@ -72,7 +68,20 @@
'WITH_BF_DOCS',
'BF_NUMJOBS',
]
-
+
+ # Have options here that scons expects to be lists
+ opts_list_split = [
+ 'BF_PYTHON_LINKFLAGS',
+ 'BF_OPENGL_LINKFLAGS',
+ 'CFLAGS', 'CCFLAGS', 'CXXFLAGS', 'CPPFLAGS',
+ 'REL_CFLAGS', 'REL_CCFLAGS', 'REL_CXXFLAGS',
+ 'BF_PROFILE_CFLAGS', 'BF_PROFILE_CCFLAGS',
'BF_PROFILE_CXXFLAGS', 'BF_PROFILE_LINKFLAGS',
+ 'BF_DEBUG_CFLAGS', 'BF_DEBUG_CCFLAGS',
'BF_DEBUG_CXXFLAGS',
+ 'C_WARN', 'CC_WARN', 'CXX_WARN',
+ 'LLIBS', 'PLATFORM_LINKFLAGS',
+ ]
+
+
arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME',
'BF_BUILDDIR', 'BF_FANCY', 'BF_QUICK', 'BF_PROFILE',
@@ -81,12 +90,13 @@
'BF_LISTDEBUG', 'LCGDIR', 'BF_X264_CONFIG',
'BF_XVIDCORE_CONFIG',
'BF_DOCDIR']
- all_list = opts_list + arg_list
okdict = {}
for k,v in args.iteritems():
- if k in all_list:
+ if (k in opts_list) or (k in arg_list):
okdict[k] = v
+ elif k in opts_list_split:
+ okdict[k] = v.split() # "" have alredy been stripped
else:
print '\t'+bc.WARNING+'Invalid argument:
'+bc.ENDC+k+'='+v
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
