From 3b8760bc719dde9cfaa489656591524a442c3ada Mon Sep 17 00:00:00 2001 From: Wenzel Jakob Date: Fri, 8 Nov 2013 00:54:03 +0100 Subject: [PATCH] switch to COLLADA-DOM 2.4 on OSX --- build/config-macos10.6-gcc-universal.py | 2 +- build/config-macos10.6-gcc-x86.py | 2 +- build/config-macos10.6-gcc-x86_64.py | 2 +- build/config-macos10.6-icl-x86.py | 2 +- build/config-macos10.6-icl-x86_64.py | 2 +- build/config-macos10.7-gcc-universal.py | 2 +- build/config-macos10.7-gcc-x86.py | 2 +- build/config-macos10.7-gcc-x86_64.py | 2 +- build/config-macos10.7-icl-x86.py | 2 +- build/config-macos10.7-icl-x86_64.py | 2 +- build/config-macos10.8-gcc-x86_64.py | 2 +- src/converter/collada.cpp | 12 ++++-------- 12 files changed, 15 insertions(+), 19 deletions(-) diff --git a/build/config-macos10.6-gcc-universal.py b/build/config-macos10.6-gcc-universal.py index bbcafcd7..cc1003bd 100644 --- a/build/config-macos10.6-gcc-universal.py +++ b/build/config-macos10.6-gcc-universal.py @@ -23,6 +23,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] -COLLADALIB = ['collada14dom23'] +COLLADALIB = ['collada14dom24'] QTDIR = '#dependencies' FFTWLIB = ['fftw3.3'] diff --git a/build/config-macos10.6-gcc-x86.py b/build/config-macos10.6-gcc-x86.py index bc878e94..2cf160a4 100644 --- a/build/config-macos10.6-gcc-x86.py +++ b/build/config-macos10.6-gcc-x86.py @@ -23,6 +23,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] -COLLADALIB = ['collada14dom23'] +COLLADALIB = ['collada14dom24'] QTDIR = '#dependencies' FFTWLIB = ['fftw3.3'] diff --git a/build/config-macos10.6-gcc-x86_64.py b/build/config-macos10.6-gcc-x86_64.py index 930eb251..41603f5d 100644 --- a/build/config-macos10.6-gcc-x86_64.py +++ b/build/config-macos10.6-gcc-x86_64.py @@ -23,6 +23,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] -COLLADALIB = ['collada14dom23'] +COLLADALIB = ['collada14dom24'] QTDIR = '#dependencies' FFTWLIB = ['fftw3.3'] diff --git a/build/config-macos10.6-icl-x86.py b/build/config-macos10.6-icl-x86.py index fcbc0327..90411aeb 100644 --- a/build/config-macos10.6-icl-x86.py +++ b/build/config-macos10.6-icl-x86.py @@ -24,6 +24,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] -COLLADALIB = ['collada14dom23'] +COLLADALIB = ['collada14dom24'] QTDIR = '#dependencies' FFTWLIB = ['fftw3.3'] diff --git a/build/config-macos10.6-icl-x86_64.py b/build/config-macos10.6-icl-x86_64.py index 58facd69..18b88b9e 100644 --- a/build/config-macos10.6-icl-x86_64.py +++ b/build/config-macos10.6-icl-x86_64.py @@ -24,6 +24,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] -COLLADALIB = ['collada14dom23'] +COLLADALIB = ['collada14dom24'] QTDIR = '#dependencies' FFTWLIB = ['fftw3.3'] diff --git a/build/config-macos10.7-gcc-universal.py b/build/config-macos10.7-gcc-universal.py index 49c955b2..9382cf9e 100644 --- a/build/config-macos10.7-gcc-universal.py +++ b/build/config-macos10.7-gcc-universal.py @@ -23,6 +23,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] -COLLADALIB = ['collada14dom23'] +COLLADALIB = ['collada14dom24'] QTDIR = '#dependencies' FFTWLIB = ['fftw3.3'] diff --git a/build/config-macos10.7-gcc-x86.py b/build/config-macos10.7-gcc-x86.py index 0f037727..17c95b84 100644 --- a/build/config-macos10.7-gcc-x86.py +++ b/build/config-macos10.7-gcc-x86.py @@ -23,6 +23,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] -COLLADALIB = ['collada14dom23'] +COLLADALIB = ['collada14dom24'] QTDIR = '#dependencies' FFTWLIB = ['fftw3.3'] diff --git a/build/config-macos10.7-gcc-x86_64.py b/build/config-macos10.7-gcc-x86_64.py index d354ce1c..1813d095 100644 --- a/build/config-macos10.7-gcc-x86_64.py +++ b/build/config-macos10.7-gcc-x86_64.py @@ -23,6 +23,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] -COLLADALIB = ['collada14dom23'] +COLLADALIB = ['collada14dom24'] QTDIR = '#dependencies' FFTWLIB = ['fftw3.3'] diff --git a/build/config-macos10.7-icl-x86.py b/build/config-macos10.7-icl-x86.py index 6b197385..3a6cdffc 100644 --- a/build/config-macos10.7-icl-x86.py +++ b/build/config-macos10.7-icl-x86.py @@ -24,6 +24,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] -COLLADALIB = ['collada14dom23'] +COLLADALIB = ['collada14dom24'] QTDIR = '#dependencies' FFTWLIB = ['fftw3.3'] diff --git a/build/config-macos10.7-icl-x86_64.py b/build/config-macos10.7-icl-x86_64.py index 8a0a7bb7..c6f000fd 100644 --- a/build/config-macos10.7-icl-x86_64.py +++ b/build/config-macos10.7-icl-x86_64.py @@ -24,6 +24,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] -COLLADALIB = ['collada14dom23'] +COLLADALIB = ['collada14dom24'] QTDIR = '#dependencies' FFTWLIB = ['fftw3.3'] diff --git a/build/config-macos10.8-gcc-x86_64.py b/build/config-macos10.8-gcc-x86_64.py index cc84c5ee..2a64ccc1 100644 --- a/build/config-macos10.8-gcc-x86_64.py +++ b/build/config-macos10.8-gcc-x86_64.py @@ -23,6 +23,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] -COLLADALIB = ['collada14dom23'] +COLLADALIB = ['collada14dom24'] QTDIR = '#dependencies' FFTWLIB = ['fftw3.3'] diff --git a/src/converter/collada.cpp b/src/converter/collada.cpp index b4c74b00..9f924241 100644 --- a/src/converter/collada.cpp +++ b/src/converter/collada.cpp @@ -16,8 +16,8 @@ along with this program. If not, see . */ -/* Use the new version of COLLADA DOM */ -#define COLLADA_DOM_SUPPORT141 1 +#define COLLADA_DOM_SUPPORT141 +#define COLLADA_DOM_USING_141 #include #include @@ -50,10 +50,6 @@ #include "converter.h" -#ifdef COLLADA_DOM_SUPPORT141 -using namespace ColladaDOM141; -#endif - typedef std::map StringMap; typedef std::map RefCountMap; typedef std::multimap AnimationMap; @@ -1595,9 +1591,9 @@ void GeometryConverter::convertCollada(const fs::path &inputFile, CustomErrorHandler errorHandler; daeErrorHandler::setErrorHandler(&errorHandler); SLog(EInfo, "Loading \"%s\" ..", inputFile.filename().string().c_str()); -#if COLLADA_DOM_SUPPORT141 +#ifdef COLLADA_DOM_USING_141 1 DAE *dae = new DAE(NULL, NULL, "1.4.1"); - domCOLLADA *document = dae->open141(inputFile.string()); + ColladaDOM141::domCOLLADA *document = dae->open141(inputFile.string()); if (document == NULL) SLog(EError, "Could not load \"%s\"!", inputFile.string().c_str()); #else