[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55712] trunk/blender: Fix build for MinGW without opencollada (updated libs coming soon), MinGW64 now builds with opencollada

[Antony Riakiotakis]

Revision: 55712
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55712
Author:   psy-fi
Date:     2013-04-02 02:05:03 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
Fix build for MinGW without opencollada (updated libs coming soon), MinGW64 now builds with opencollada

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/intern/opencolorio/CMakeLists.txt
    trunk/blender/intern/opencolorio/SConscript

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-04-02 02:02:40 UTC (rev 55711)
+++ trunk/blender/CMakeLists.txt	2013-04-02 02:05:03 UTC (rev 55712)
@@ -1289,17 +1289,17 @@
 		if(WITH_OPENCOLLADA)
 			set(OPENCOLLADA ${LIBDIR}/opencollada)
 			set(OPENCOLLADA_INCLUDE_DIRS
-				${OPENCOLLADA}/include/COLLADAStreamWriter
-				${OPENCOLLADA}/include/COLLADABaseUtils
-				${OPENCOLLADA}/include/COLLADAFramework
-				${OPENCOLLADA}/include/COLLADASaxFrameworkLoader
-				${OPENCOLLADA}/include/GeneratedSaxParser
+				${OPENCOLLADA}/include/opencollada/COLLADAStreamWriter
+				${OPENCOLLADA}/include/opencollada/COLLADABaseUtils
+				${OPENCOLLADA}/include/opencollada/COLLADAFramework
+				${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
+				${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
 			)
 			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada)
 			if(WITH_MINGW64)
-				set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
+				set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver buffer ftoa xml)
 			else()
-				set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
+				set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat buffer ftoa)
 			endif()
 			set(PCRE_LIBRARIES pcre)
 		endif()

Modified: trunk/blender/intern/opencolorio/CMakeLists.txt
===================================================================
--- trunk/blender/intern/opencolorio/CMakeLists.txt	2013-04-02 02:02:40 UTC (rev 55711)
+++ trunk/blender/intern/opencolorio/CMakeLists.txt	2013-04-02 02:05:03 UTC (rev 55712)
@@ -44,6 +44,7 @@
 if(WITH_OPENCOLORIO)
 	add_definitions(
 		-DWITH_OCIO
+		-DGLEW_STATIC
 	)
 
 	list(APPEND INC_SYS

Modified: trunk/blender/intern/opencolorio/SConscript
===================================================================
--- trunk/blender/intern/opencolorio/SConscript	2013-04-02 02:02:40 UTC (rev 55711)
+++ trunk/blender/intern/opencolorio/SConscript	2013-04-02 02:05:03 UTC (rev 55712)
@@ -30,7 +30,7 @@
 sources = env.Glob('*.cc')
 
 incs = '. ../guardedalloc ../../source/blender/blenlib'
-defs = []
+defs = [ 'GLEW_STATIC' ]
 
 if env['WITH_BF_OCIO']:
     defs.append('WITH_OCIO')