Browse Source

Fixed GCC 4.2.4 build

Christophe Riccio 14 years ago
parent
commit
671ebd40eb
3 changed files with 8 additions and 5 deletions
  1. 4 4
      CMakeLists.txt
  2. 1 1
      glm/glm.hpp
  3. 3 0
      test/core/core_func_integer.cpp

+ 4 - 4
CMakeLists.txt

@@ -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)

+ 1 - 1
glm/glm.hpp

@@ -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 - 0
test/core/core_func_integer.cpp

@@ -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;