[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20691] branches/soc-2009-chingachgook: Added BF_OPENCOLLADA_* and BF_PCRE_* scons settings to linux config.

[Chingiz Dyussenov]

Revision: 20691
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20691
Author:   chingachgook
Date:     2009-06-07 07:03:55 +0200 (Sun, 07 Jun 2009)

Log Message:
-----------
Added BF_OPENCOLLADA_* and BF_PCRE_* scons settings to linux config. 
OpenCollada and pcre are added as 3rd party libraries collada module 
depends on.

I now build Blender with:
scons BF_DEBUG=1 BF_OPENCOLLADA_LIBPATH=/home/chin/src/opencollada/ BF_OPENCOLLADA=/home/chin/src/opencollada

Modified Paths:
--------------
    branches/soc-2009-chingachgook/source/blender/collada/SConscript
    branches/soc-2009-chingachgook/tools/Blender.py
    branches/soc-2009-chingachgook/tools/btools.py

Modified: branches/soc-2009-chingachgook/source/blender/collada/SConscript
===================================================================
--- branches/soc-2009-chingachgook/source/blender/collada/SConscript	2009-06-06 22:14:45 UTC (rev 20690)
+++ branches/soc-2009-chingachgook/source/blender/collada/SConscript	2009-06-07 05:03:55 UTC (rev 20691)
@@ -4,7 +4,7 @@
 sources = env.Glob('*.cpp')
 
 # relative paths to include dirs, space-separated, string
-incs = '../blenlib ../blenkernel'
+incs = '../blenlib ../blenkernel %s/COLLADAStreamWriter/include %s/COLLADABaseUtils/include' % (env['BF_OPENCOLLADA'], env['BF_OPENCOLLADA']) + ' ../makesdna'
 
-env.BlenderLib ('bf_collada', sources, Split(incs), [], libtype='core', priority=150 )
+env.BlenderLib ('bf_collada', sources, Split(incs), [], libtype='core', priority=200 )
 

Modified: branches/soc-2009-chingachgook/tools/Blender.py
===================================================================
--- branches/soc-2009-chingachgook/tools/Blender.py	2009-06-06 22:14:45 UTC (rev 20690)
+++ branches/soc-2009-chingachgook/tools/Blender.py	2009-06-07 05:03:55 UTC (rev 20691)
@@ -147,6 +147,11 @@
 	if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
 		libincs += Split(lenv['BF_PTHREADS_LIBPATH'])
 
+	if lenv['WITH_BF_COLLADA']:
+		libincs += Split(lenv['BF_OPENCOLLADA_LIBPATH'])
+		libincs += Split(lenv['BF_PCRE_LIBPATH'])
+
+
 	return statlibs, libincs
 
 def setup_syslibs(lenv):
@@ -190,6 +195,9 @@
 		syslibs += Split(lenv['BF_PTHREADS_LIB'])
 	if lenv['WITH_BF_LCMS']:
 		syslibs.append(lenv['BF_LCMS_LIB'])
+	if lenv['WITH_BF_COLLADA']:
+		syslibs.append(lenv['BF_OPENCOLLADA_LIB'])
+		syslibs.append(lenv['BF_PCRE_LIB'])
 
 
 	syslibs += lenv['LLIBS']

Modified: branches/soc-2009-chingachgook/tools/btools.py
===================================================================
--- branches/soc-2009-chingachgook/tools/btools.py	2009-06-06 22:14:45 UTC (rev 20690)
+++ branches/soc-2009-chingachgook/tools/btools.py	2009-06-07 05:03:55 UTC (rev 20691)
@@ -49,7 +49,7 @@
 			'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',
-			'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC', 'BF_COLLADA_LIB',
+			'WITH_BF_COLLADA', 'BF_COLLADA', 'BF_COLLADA_INC', 'BF_COLLADA_LIB', 'BF_OPENCOLLADA', 'BF_OPENCOLLADA_LIB', 'BF_OPENCOLLADA_LIBPATH', 'BF_PCRE', 'BF_PCRE_LIB', 'BF_PCRE_LIBPATH',
 			'WITH_BF_PLAYER',
 			'WITH_BF_NOBLENDER',
 			'WITH_BF_BINRELOC',
@@ -313,6 +313,12 @@
 		('BF_COLLADA', 'COLLADA base path', ''),
 		('BF_COLLADA_INC', 'COLLADA include path', ''),
 		('BF_COLLADA_LIB', 'COLLADA library', ''),
+		('BF_OPENCOLLADA', 'OpenCollada base path', ''),
+		('BF_OPENCOLLADA_LIB', 'OpenCollada library', ''),
+		('BF_OPENCOLLADA_LIBPATH', 'OpenCollada library path', ''),
+		('BF_PCRE', 'PCRE base path', ''),
+		('BF_PCRE_LIB', 'PCRE library', ''),
+		('BF_PCRE_LIBPATH', 'PCRE library path', ''),
 		
 		(BoolVariable('WITH_BF_PLAYER', 'Build blenderplayer if true', False)),
 		(BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true', False)),