Browse Source

Added Visual C++ Clang toolset detection

Christophe Riccio 9 years ago
parent
commit
74367aca3c
2 changed files with 17 additions and 16 deletions
  1. 16 16
      glm/simd/platform.h
  2. 1 0
      readme.md

+ 16 - 16
glm/simd/platform.h

@@ -163,22 +163,6 @@
 #		define GLM_COMPILER GLM_COMPILER_CUDA
 #	endif
 
-// Visual C++
-#elif defined(_MSC_VER)
-#	if _MSC_VER < 1600
-#		error "GLM requires Visual C++ 2010 or higher"
-#	elif _MSC_VER == 1600
-#		define GLM_COMPILER GLM_COMPILER_VC2010
-#	elif _MSC_VER == 1700
-#		define GLM_COMPILER GLM_COMPILER_VC2012
-#	elif _MSC_VER == 1800
-#		define GLM_COMPILER GLM_COMPILER_VC2013
-#	elif _MSC_VER >= 1900
-#		define GLM_COMPILER GLM_COMPILER_VC2015
-#	else//_MSC_VER
-#		define GLM_COMPILER GLM_COMPILER_VC
-#	endif//_MSC_VER
-
 // Clang
 #elif defined(__clang__)
 #	if GLM_PLATFORM & GLM_PLATFORM_APPLE
@@ -223,6 +207,22 @@
 #		endif
 #	endif
 
+// Visual C++
+#elif defined(_MSC_VER)
+#	if _MSC_VER < 1600
+#		error "GLM requires Visual C++ 2010 or higher"
+#	elif _MSC_VER == 1600
+#		define GLM_COMPILER GLM_COMPILER_VC2010
+#	elif _MSC_VER == 1700
+#		define GLM_COMPILER GLM_COMPILER_VC2012
+#	elif _MSC_VER == 1800
+#		define GLM_COMPILER GLM_COMPILER_VC2013
+#	elif _MSC_VER >= 1900
+#		define GLM_COMPILER GLM_COMPILER_VC2015
+#	else//_MSC_VER
+#		define GLM_COMPILER GLM_COMPILER_VC
+#	endif//_MSC_VER
+
 // G++
 #elif defined(__GNUC__) || defined(__MINGW32__)
 #	if (__GNUC__ == 4) && (__GNUC_MINOR__ == 2)

+ 1 - 0
readme.md

@@ -72,6 +72,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 - Improved OpenMP support detection for Clang, GCC, ICC and VC
 - Added constexpr for *vec*, *mat*, *quat* and *dual_quat* types #493
 - Use Cuda built-in function for abs function implementation with Cuda compiler
+- Added Visual C++ Clang toolset detection
 
 ##### Fixes:
 - Fixed GTX_extended_min_max filename typo #386