[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35796] trunk/blender/source/blender/ collada: Update cmake & scons scripts to use new Collada includes for building with latest blender collada updates

[Damien Plisson]

Revision: 35796
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35796
Author:   damien78
Date:     2011-03-26 09:09:00 +0000 (Sat, 26 Mar 2011)
Log Message:
-----------
Update cmake & scons scripts to use new Collada includes for building with latest blender collada updates

Modified Paths:
--------------
    trunk/blender/source/blender/collada/CMakeLists.txt
    trunk/blender/source/blender/collada/SConscript

Modified: trunk/blender/source/blender/collada/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/collada/CMakeLists.txt	2011-03-26 09:07:31 UTC (rev 35795)
+++ trunk/blender/source/blender/collada/CMakeLists.txt	2011-03-26 09:09:00 UTC (rev 35796)
@@ -43,7 +43,8 @@
 		${OPENCOLLADA_INC}/COLLADAStreamWriter
 		${OPENCOLLADA_INC}/COLLADABaseUtils
 		${OPENCOLLADA_INC}/COLLADAFramework
-		${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader 
+		${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader
+		${OPENCOLLADA_INC}/GeneratedSaxParser 
 	)
 else()
 	list(APPEND INC

Modified: trunk/blender/source/blender/collada/SConscript
===================================================================
--- trunk/blender/source/blender/collada/SConscript	2011-03-26 09:07:31 UTC (rev 35795)
+++ trunk/blender/source/blender/collada/SConscript	2011-03-26 09:09:00 UTC (rev 35796)
@@ -33,7 +33,7 @@
 # TODO sanitize inc path building
 # relative paths to include dirs, space-separated, string
 if  env['OURPLATFORM']=='darwin':
-    incs = '../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
+    incs = '../blenlib ../blenkernel ../windowmanager ../blenloader ../makesdna ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter [OPENCOLLADA]/COLLADABaseUtils [OPENCOLLADA]/COLLADAFramework [OPENCOLLADA]/COLLADASaxFrameworkLoader [OPENCOLLADA]/GeneratedSaxParser '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])
 else:
     incs = '../blenlib ../blenkernel ../windowmanager ../makesdna ../blenloader ../makesrna ../editors/include ../../../intern/guardedalloc [OPENCOLLADA]/COLLADAStreamWriter/include [OPENCOLLADA]/COLLADABaseUtils/include [OPENCOLLADA]/COLLADAFramework/include [OPENCOLLADA]/COLLADASaxFrameworkLoader/include [OPENCOLLADA]/GeneratedSaxParser/include '.replace('[OPENCOLLADA]', env['BF_OPENCOLLADA_INC'])