Fixed 64 bits in Visual C++

glm/gtx/simd_vec4.hpp

@@ -18,7 +18,7 @@
 #include "../glm.hpp"
 
 #if(!(GLM_ARCH & GLM_ARCH_SSE2))
-#error "GLM: GLM_GTX_simd_vec4 requires compiler support of SSE2 through intrinsics"
+#	error "GLM: GLM_GTX_simd_vec4 requires compiler support of SSE2 through intrinsics"
 #endif
 
 #include "../core/intrinsic_common.hpp"

glm/setup.hpp

@@ -238,14 +238,14 @@
 /////////////////
 // Platform 
 
-#define GLM_ARCH_PURE		0x0000
-#define GLM_ARCH_SSE2		0x0001
-#define GLM_ARCH_SSE3		0x0002 | GLM_ARCH_SSE2
-#define GLM_ARCH_AVX		0x0004 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2
+#define GLM_ARCH_PURE		0x0000 //(0x0000)
+#define GLM_ARCH_SSE2		0x0001 //(0x0001)
+#define GLM_ARCH_SSE3		0x0003 //(0x0002 | GLM_ARCH_SSE2)
+#define GLM_ARCH_AVX		0x0007 //(0x0004 | GLM_ARCH_SSE3 | GLM_ARCH_SSE2)
 
 #if(defined(GLM_FORCE_PURE))
 #	define GLM_ARCH GLM_ARCH_PURE
-#elif((GLM_COMPILER & GLM_COMPILER_VC) && defined(_M_IX86))
+#elif((GLM_COMPILER & GLM_COMPILER_VC) && (defined(_M_IX86) || defined(_M_X64)))
 #	if(defined(_M_CEE_PURE))
 #		define GLM_ARCH GLM_ARCH_PURE
 #	elif(GLM_COMPILER >= GLM_COMPILER_VC2010)

test/gtx/gtx-simd-mat4.cpp

@@ -7,7 +7,6 @@
 // File    : test/gtx/simd-mat4.cpp
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define GLM_INSTRUCTION_SET GLM_PLATFORM_SSE3 | GLM_PLATFORM_SSE2
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/quaternion.hpp>