Browse Source

Fixed MinGW32 build

Christophe Riccio 10 years ago
parent
commit
7751bd4af4
3 changed files with 4 additions and 4 deletions
  1. 2 2
      CMakeLists.txt
  2. 1 1
      glm/detail/setup.hpp
  3. 1 1
      readme.txt

+ 2 - 2
CMakeLists.txt

@@ -129,8 +129,8 @@ endif()
 if(CMAKE_COMPILER_IS_GNUCXX)
 	#add_definitions(-S)
 	#add_definitions(-s)
-	#add_definitions(-m32)
-	#add_definitions(-O3)
+	add_definitions(-m32)
+	add_definitions(-O2)
 
 	#add_definitions(-fprofile-arcs -ftest-coverage) gcov
 	#ctest_enable_coverage()

+ 1 - 1
glm/detail/setup.hpp

@@ -745,7 +745,7 @@
 // With MinGW-W64, including intrinsic headers before intrin.h will produce some errors. The problem is
 // that windows.h (and maybe other headers) will silently include intrin.h, which of course causes problems.
 // To fix, we just explicitly include intrin.h here.
-#if defined(__MINGW32__) && (GLM_ARCH != GLM_ARCH_PURE)
+#if defined(__MINGW64__) && (GLM_ARCH != GLM_ARCH_PURE)
 #	include <intrin.h>
 #endif
 

+ 1 - 1
readme.txt

@@ -64,7 +64,7 @@ More informations in GLM manual:
 http://glm.g-truc.net/glm.pdf
 
 ================================================================================
-GLM 0.9.6.2: 2015-01-XX
+GLM 0.9.6.2: 2015-02-15
 --------------------------------------------------------------------------------
 Features:
 - Added display of GLM version with other GLM_MESSAGES