Browse Source

Fixed long long warnings when using C++98 on GCC and Clang #482

Christophe Riccio 9 years ago
parent
commit
082272421a
2 changed files with 7 additions and 0 deletions
  1. 6 0
      CMakeLists.txt
  2. 1 0
      readme.md

+ 6 - 0
CMakeLists.txt

@@ -53,6 +53,12 @@ if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR ("${CMAKE_CXX_COMPILER_ID}"
 		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++98")
 		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++98")
 		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
 		set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
 		set(CMAKE_CXX_FLAGS "-std=c++98")
 		set(CMAKE_CXX_FLAGS "-std=c++98")
+		if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU"))
+			# GLM is using GCC 64 bits integer extension
+			add_definitions(-Wno-long-long)
+		elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+			add_definitions(-Wno-c++11-long-long)
+		endif()
 	endif()
 	endif()
 endif()
 endif()
 
 

+ 1 - 0
readme.md

@@ -68,6 +68,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 ##### Fixes:
 ##### Fixes:
 - Fixed GTX_extended_min_max filename typo #386
 - Fixed GTX_extended_min_max filename typo #386
 - Fixed intersectRayTriangle to not do any unintentional backface culling
 - Fixed intersectRayTriangle to not do any unintentional backface culling
+- Fixed long long warnings when using C++98 on GCC and Clang #482
 
 
 #### [GLM 0.9.7.4](https://github.com/g-truc/glm/tree/0.9.7) - 2016-XX-XX
 #### [GLM 0.9.7.4](https://github.com/g-truc/glm/tree/0.9.7) - 2016-XX-XX
 ##### Fixes:
 ##### Fixes: