organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-10 07:18:54 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Fixed GCC 4.2.4 build

Browse source
This commit is contained in:
Christophe Riccio 2011-10-22 02:49:28 +01:00
parent 6c00ffa1b4
commit 671ebd40eb
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -11,10 +11,10 @@ if(CMAKE_COMPILER_IS_GNUCXX)
#add_definitions(-pedantic)
#add_definitions(-S)
#add_definitions(-s)
add_definitions(-msse2)
add_definitions(-std=c++0x)
add_definitions(-fms-extensions)
add_definitions(-D_MSC_EXTENSIONS)
#add_definitions(-msse2)
#add_definitions(-std=c++0x)
#add_definitions(-fms-extensions)
#add_definitions(-D_MSC_EXTENSIONS)
#add_definitions(-m32)
#add_definitions(-mfpmath=387)
#add_definitions(-ffast-math)

2
glm/glm.hpp
View file

@ -84,7 +84,7 @@
#include <climits>
#include <cfloat>
#include <limits>
#include <type_traits>
//#include <type_traits>
#include "core/setup.hpp"
#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_CORE_INCLUDED_DISPLAYED))

3
test/core/core_func_integer.cpp
View file

@ -129,6 +129,9 @@ namespace bitRevert
int main()
{
int Error = 0;
//GLM_STATIC_ASSERT(sizeof(glm::uint64) == 2, "glm::uint64 isn't a 64 bits type");
Error += ::extractField::test();
Error += ::bitRevert::test();
return Error;