From 7751bd4af4ed1c7c26711a3c005c866b03f27c50 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sat, 14 Feb 2015 00:19:47 +0100 Subject: [PATCH] Fixed MinGW32 build --- CMakeLists.txt | 4 ++-- glm/detail/setup.hpp | 2 +- readme.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ac4411d..84d2c1d0 100644 --- a/CMakeLists.txt +++ b/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() diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index ad734ed7..f4385fca 100644 --- a/glm/detail/setup.hpp +++ b/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 #endif diff --git a/readme.txt b/readme.txt index 1c19ba1f..7ca5bf76 100644 --- a/readme.txt +++ b/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