[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55721] trunk/blender: Fix compilation on MinGW(64/32)

[Antony Riakiotakis]

Revision: 55721
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55721
Author:   psy-fi
Date:     2013-04-02 13:07:01 +0000 (Tue, 02 Apr 2013)
Log Message:
-----------
Fix compilation on MinGW(64/32)

Also, add appropriate lib paths for recent OpenCollada for mingw32 (coming soon to an svn server near you)

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/blender/editors/util/CMakeLists.txt
    trunk/blender/source/blender/editors/util/SConscript

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2013-04-02 12:54:47 UTC (rev 55720)
+++ trunk/blender/CMakeLists.txt	2013-04-02 13:07:01 UTC (rev 55721)
@@ -1296,11 +1296,7 @@
 				${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
 			)
 			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada)
-			if(WITH_MINGW64)
-				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 buffer ftoa)
-			endif()
+			set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver buffer ftoa xml)
 			set(PCRE_LIBRARIES pcre)
 		endif()
 
@@ -1413,8 +1409,8 @@
 				LLVMX86Disassembler LLVMX86Info
 				LLVMX86Utils LLVMipa
 				LLVMipo LLVMCore)
-				#imagehelp is needed by LLVM 3.1 on MinGW, check lib\Support\Windows\Signals.inc
-				set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -limagehlp")
+			#imagehelp is needed by LLVM 3.1 on MinGW, check lib\Support\Windows\Signals.inc
+			set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -limagehlp")
 			set(LLVM_STATIC YES)
 		endif()
 		

Modified: trunk/blender/source/blender/editors/util/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/util/CMakeLists.txt	2013-04-02 12:54:47 UTC (rev 55720)
+++ trunk/blender/source/blender/editors/util/CMakeLists.txt	2013-04-02 13:07:01 UTC (rev 55721)
@@ -90,6 +90,8 @@
 	../include/UI_view2d.h
 )
 
+add_definitions(-DGLEW_STATIC)
+
 if(WITH_INTERNATIONAL)
 	add_definitions(-DWITH_INTERNATIONAL)
 endif()

Modified: trunk/blender/source/blender/editors/util/SConscript
===================================================================
--- trunk/blender/source/blender/editors/util/SConscript	2013-04-02 12:54:47 UTC (rev 55720)
+++ trunk/blender/source/blender/editors/util/SConscript	2013-04-02 13:07:01 UTC (rev 55721)
@@ -28,7 +28,7 @@
 Import ('env')
 
 sources = env.Glob('*.c')
-defs = []
+defs = [ 'GLEW_STATIC' ]
 
 incs = '../include ../../blenfont ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
 incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include'