mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-23 01:14:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed MinGW32 build

Browse Source
This commit is contained in:
Christophe Riccio 2015-02-14 00:19:47 +01:00
parent d33974afa6
commit 7751bd4af4
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

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

2
glm/detail/setup.hpp
View File

@ -745,7 +745,7 @@
// With MinGW-W64, including intrinsic headers before intrin.h will produce some errors. The problem is // 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. // 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. // 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> # include <intrin.h>
#endif #endif

2
readme.txt
View File

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