Update cmake & scons scripts to use new Collada includes for building with latest...
authorDamien Plisson <damien.plisson@yahoo.fr>
Sat, 26 Mar 2011 09:09:00 +0000 (09:09 +0000)
committerDamien Plisson <damien.plisson@yahoo.fr>
Sat, 26 Mar 2011 09:09:00 +0000 (09:09 +0000)
source/blender/collada/CMakeLists.txt
source/blender/collada/SConscript

index 13c33e63869c8e3fe9e6cddb47f509e415c62196..fa7bfee8ee55405e9935fddc0aac4c1669bde540 100644 (file)
@@ -43,7 +43,8 @@ if(APPLE)
                ${OPENCOLLADA_INC}/COLLADAStreamWriter
                ${OPENCOLLADA_INC}/COLLADABaseUtils
                ${OPENCOLLADA_INC}/COLLADAFramework
-               ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader 
+               ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader
+               ${OPENCOLLADA_INC}/GeneratedSaxParser 
        )
 else()
        list(APPEND INC
index b2a25e81dd51632848adde14e081bfe522ddc71c..3dd6160c445da506fb239b0e8ceafc1e5a9bbc09 100644 (file)
@@ -33,7 +33,7 @@ defs = []
 # 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'])