From ed3d253c561b504d4b0dad7d4156933ba7adc200 Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Tue, 23 Aug 2011 08:02:48 +0000 Subject: Fix for [#28339] Rev:39618 The revision part doesn't suffice. NAN_BUILDINFO > WITH_BUILDINFO change from rev 39618 was missing in those files. --- source/blender/collada/SConscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/collada') diff --git a/source/blender/collada/SConscript b/source/blender/collada/SConscript index 3dd6160c445..17cca9e3706 100644 --- a/source/blender/collada/SConscript +++ b/source/blender/collada/SConscript @@ -38,6 +38,6 @@ 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']) if env['BF_BUILDINFO']: - defs.append('NAN_BUILDINFO') + defs.append('WITH_BUILDINFO') env.BlenderLib ('bf_collada', sources, Split(incs), defs, libtype='core', priority=200 ) -- cgit v1.2.3 From 9ad6434c4e6c1d157d4ce4d0904c46154229aec9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 24 Aug 2011 16:04:35 +0000 Subject: opencollada find module. hopefully solves the problem where includes can in an `/include` subdir or not. --- source/blender/collada/CMakeLists.txt | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'source/blender/collada') diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt index b5c84bc3c84..3466c3ab5c0 100644 --- a/source/blender/collada/CMakeLists.txt +++ b/source/blender/collada/CMakeLists.txt @@ -39,27 +39,9 @@ set(INC ) set(INC_SYS - + ${OPENCOLLADA_INCLUDE_DIRS} ) -if(APPLE) - list(APPEND INC_SYS - ${OPENCOLLADA_INCLUDE_DIR}/COLLADAStreamWriter - ${OPENCOLLADA_INCLUDE_DIR}/COLLADABaseUtils - ${OPENCOLLADA_INCLUDE_DIR}/COLLADAFramework - ${OPENCOLLADA_INCLUDE_DIR}/COLLADASaxFrameworkLoader - ${OPENCOLLADA_INCLUDE_DIR}/GeneratedSaxParser - ) -else() - list(APPEND INC_SYS - ${OPENCOLLADA_INCLUDE_DIR}/COLLADAStreamWriter/include - ${OPENCOLLADA_INCLUDE_DIR}/COLLADABaseUtils/include - ${OPENCOLLADA_INCLUDE_DIR}/COLLADAFramework/include - ${OPENCOLLADA_INCLUDE_DIR}/COLLADASaxFrameworkLoader/include - ${OPENCOLLADA_INCLUDE_DIR}/GeneratedSaxParser/include - ) -endif() - set(SRC AnimationImporter.cpp ArmatureExporter.cpp -- cgit v1.2.3