modified build system for updated opencollada libraries (windows only, other platform...
authorGaia Clary <gaia.clary@machinimatrix.org>
Thu, 28 Mar 2013 18:02:24 +0000 (18:02 +0000)
committerGaia Clary <gaia.clary@machinimatrix.org>
Thu, 28 Mar 2013 18:02:24 +0000 (18:02 +0000)
CMakeLists.txt
build_files/scons/config/win32-mingw-config.py
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-mingw-config.py
build_files/scons/config/win64-vc-config.py

index 14f45c0b7f5da83c60dc44ced4ede91fc698a956..3cd320c2f3137b3519a381e51a05370e8f9b6166 100644 (file)
@@ -1067,28 +1067,28 @@ elseif(WIN32)
                        set(OPENCOLLADA ${LIBDIR}/opencollada)
 
                        set(OPENCOLLADA_INCLUDE_DIRS
-                               ${LIBDIR}/opencollada/include/COLLADAStreamWriter/include
-                               ${LIBDIR}/opencollada/include/COLLADABaseUtils/include
-                               ${LIBDIR}/opencollada/include/COLLADAFramework/include
-                               ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
-                               ${LIBDIR}/opencollada/include/GeneratedSaxParser/include
+                               ${OPENCOLLADA}/include/opencollada/COLLADAStreamWriter
+                               ${OPENCOLLADA}/include/opencollada/COLLADABaseUtils
+                               ${OPENCOLLADA}/include/opencollada/COLLADAFramework
+                               ${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
+                               ${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
                        )
                        set_lib_path(OPENCOLLADA_LIBPATH "opencollada")
 
                        set(OPENCOLLADA_LIBRARIES
-                               ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADASaxFrameworkLoader.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADAFramework.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADABaseUtils.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADAStreamWriter.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/MathMLSolver.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/GeneratedSaxParser.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/xml2.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/buffer.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/ftoa.lib
-                               ${OPENCOLLADA_LIBPATH}/lib/UTF.lib
+                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
+                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAFramework.lib
+                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADABaseUtils.lib
+                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAStreamWriter.lib
+                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/MathMLSolver.lib
+                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/GeneratedSaxParser.lib
+                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/xml.lib
+                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/buffer.lib
+                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/ftoa.lib
+                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/UTF.lib
                        )
                        set(PCRE_LIBRARIES
-                               ${OPENCOLLADA_LIBPATH}/lib/pcre.lib
+                               ${OPENCOLLADA_LIBPATH}/lib/opencollada/pcre.lib
                        )
                        
                        unset(OPENCOLLADA_LIBPATH)
@@ -1289,13 +1289,13 @@ elseif(WIN32)
                if(WITH_OPENCOLLADA)
                        set(OPENCOLLADA ${LIBDIR}/opencollada)
                        set(OPENCOLLADA_INCLUDE_DIRS
-                               ${LIBDIR}/opencollada/include/COLLADAStreamWriter/include
-                               ${LIBDIR}/opencollada/include/COLLADABaseUtils/include
-                               ${LIBDIR}/opencollada/include/COLLADAFramework/include
-                               ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
-                               ${LIBDIR}/opencollada/include/GeneratedSaxParser/include
+                               ${OPENCOLLADA}/include/COLLADAStreamWriter
+                               ${OPENCOLLADA}/include/COLLADABaseUtils
+                               ${OPENCOLLADA}/include/COLLADAFramework
+                               ${OPENCOLLADA}/include/COLLADASaxFrameworkLoader
+                               ${OPENCOLLADA}/include/GeneratedSaxParser
                        )
-                       set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
+                       set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada)
                        if(WITH_MINGW64)
                                set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
                        else()
index b5bcbc9266558aa98a7d23628b6ff1f792a637c3..acf2347f67794242a0600395d591b953b989005a 100644 (file)
@@ -141,9 +141,9 @@ BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
 
 BF_OPENCOLLADA = LIBDIR + '/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include/opencollada'
 BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
 
 #Cycles
 WITH_BF_CYCLES = True 
index 8d17c777b0fcbb4c05290c0532729d228e62e273..72866a75ff4a15b68eedba33b09192b3da118205 100644 (file)
@@ -139,9 +139,9 @@ BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
 
 BF_OPENCOLLADA = LIBDIR + '/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa UTF'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include/opencollada'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml pcre buffer ftoa UTF'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
 
 WITH_BF_3DMOUSE = True
 
index 0a604b0f861763868f5842521ed75f2c67fddaf3..e8fd3f175e11948e0e41292742953f505a3fb83a 100644 (file)
@@ -138,9 +138,9 @@ BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
 
 BF_OPENCOLLADA = LIBDIR + '/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include/opencollada'
 BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
 
 #Cycles
 WITH_BF_CYCLES = True
index 4e763343fe64e313d4390b180e5aab64f852b84f..0f0c457d1e8f81abfc85a63d8a3f6392c1867aff 100644 (file)
@@ -135,9 +135,9 @@ BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
 
 BF_OPENCOLLADA = LIBDIR + '/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa UTF'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include/opencollada'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml pcre buffer ftoa UTF'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib/opencollada'
 
 WITH_BF_3DMOUSE = True