[Bf-blender-cvs] [5685c43] master: Select appropriate folder for MinGW-w64 gcc 4.9

[Antony Riakiotakis]

Commit: 5685c43586b900ed561eac3e5762a7d68b304447
Author: Antony Riakiotakis
Date:   Fri Jan 16 15:02:48 2015 +0200
Branches: master
https://developer.blender.org/rB5685c43586b900ed561eac3e5762a7d68b304447

Select appropriate folder for MinGW-w64 gcc 4.9

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index df5b458..4f0fa76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1510,7 +1510,12 @@ elseif(WIN32)
 		
 		if(WITH_MINGW64)
 			message(STATUS "Compiling for 64 bit with MinGW-w64.")
-			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
+			execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+			if (GCC_VERSION VERSION_GREATER 4.9 OR GCC_VERSION VERSION_EQUAL 4.9)
+				set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64_gcc49)
+			else()
+				set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw)
+			endif()
 		else()
 			message(STATUS "Compiling for 32 bit with MinGW-w32.")
 			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)