From ac2d935a32db96925beb86350b99212260e798f5 Mon Sep 17 00:00:00 2001 From: Damien Plisson Date: Sat, 26 Mar 2011 09:09:00 +0000 Subject: Update cmake & scons scripts to use new Collada includes for building with latest blender collada updates --- source/blender/collada/CMakeLists.txt | 3 ++- source/blender/collada/SConscript | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index 13c33e63869..fa7bfee8ee5 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -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 diff --git a/source/blender/collada/SConscript b/source/blender/collada/SConscript index b2a25e81dd5..3dd6160c445 100644 --- a/source/blender/collada/SConscript +++ b/source/blender/collada/SConscript @@ -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']) -- cgit v1.2.3