Browse Source

Fixed build

Christophe Riccio 15 years ago
parent
commit
56789da7f0
3 changed files with 17 additions and 18 deletions
  1. 0 1
      doc/src/dummy.cpp
  2. 1 17
      glm/core/_detail.hpp
  3. 16 0
      glm/glm.hpp

+ 0 - 1
doc/src/dummy.cpp

@@ -18,7 +18,6 @@ void computeNormal(triangle & Triangle)
 #include "../../glm/gtc/matrix_transform.hpp" // glm::translate, glm::rotate, glm::scale
 #include "../../glm/gtc/type_ptr.hpp" // glm::value_ptr
 #include "../../glm/gtc/quaternion.hpp" // glm::quat
-#include "../../glm/gtx/comparison.hpp" // == != 
 //#include "../../glm/ext.hpp"
 
 glm::vec4 const ClearColor = glm::vec4(glm::vec3(0.0f), 1.0f);

+ 1 - 17
glm/core/_detail.hpp

@@ -320,26 +320,10 @@ namespace detail
 }//namespace detail
 }//namespace glm
 
-////////////////////
-// check type sizes
-GLM_STATIC_ASSERT(sizeof(glm::detail::int8) == 1, "int8 size isn't 1 byte on this platform");
-GLM_STATIC_ASSERT(sizeof(glm::detail::int16) == 2, "int16 size isn't 2 bytes on this platform");
-GLM_STATIC_ASSERT(sizeof(glm::detail::int32) == 4, "int32 size isn't 4 bytes on this platform");
-GLM_STATIC_ASSERT(sizeof(glm::detail::int64) == 8, "int64 size isn't 8 bytes on this platform");
-
-GLM_STATIC_ASSERT(sizeof(glm::detail::uint8) == 1, "uint8 size isn't 1 byte on this platform");
-GLM_STATIC_ASSERT(sizeof(glm::detail::uint16) == 2, "uint16 size isn't 2 bytes on this platform");
-GLM_STATIC_ASSERT(sizeof(glm::detail::uint32) == 4, "uint32 size isn't 4 bytes on this platform");
-GLM_STATIC_ASSERT(sizeof(glm::detail::uint64) == 8, "uint64 size isn't 8 bytes on this platform");
-
-GLM_STATIC_ASSERT(sizeof(glm::detail::float16) == 2, "float16 size isn't 2 bytes on this platform");
-GLM_STATIC_ASSERT(sizeof(glm::detail::float32) == 4, "float32 size isn't 4 bytes on this platform");
-GLM_STATIC_ASSERT(sizeof(glm::detail::float64) == 8, "float64 size isn't 8 bytes on this platform");
-
 #if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2005))
 #	define GLM_DEPRECATED __declspec(deprecated)
 #	define GLM_ALIGNED(keyword, x) __declspec(align(x)) keyword
-#	define GLM_DEPRECATED __declspec(restrict)
+#	define GLM_RESTRICT __declspec(restrict)
 #	define GLM_RESTRICT_VAR __restrict
 #elif((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC31))
 #	define GLM_DEPRECATED __attribute__((__deprecated__))

+ 16 - 0
glm/glm.hpp

@@ -109,4 +109,20 @@ namespace glm
 #include "./core/func_noise.hpp"
 #include "./core/_swizzle.hpp"
 
+////////////////////
+// check type sizes
+GLM_STATIC_ASSERT(sizeof(glm::detail::int8) == 1, "int8 size isn't 1 byte on this platform");
+GLM_STATIC_ASSERT(sizeof(glm::detail::int16) == 2, "int16 size isn't 2 bytes on this platform");
+GLM_STATIC_ASSERT(sizeof(glm::detail::int32) == 4, "int32 size isn't 4 bytes on this platform");
+GLM_STATIC_ASSERT(sizeof(glm::detail::int64) == 8, "int64 size isn't 8 bytes on this platform");
+
+GLM_STATIC_ASSERT(sizeof(glm::detail::uint8) == 1, "uint8 size isn't 1 byte on this platform");
+GLM_STATIC_ASSERT(sizeof(glm::detail::uint16) == 2, "uint16 size isn't 2 bytes on this platform");
+GLM_STATIC_ASSERT(sizeof(glm::detail::uint32) == 4, "uint32 size isn't 4 bytes on this platform");
+GLM_STATIC_ASSERT(sizeof(glm::detail::uint64) == 8, "uint64 size isn't 8 bytes on this platform");
+
+GLM_STATIC_ASSERT(sizeof(glm::detail::float16) == 2, "float16 size isn't 2 bytes on this platform");
+GLM_STATIC_ASSERT(sizeof(glm::detail::float32) == 4, "float32 size isn't 4 bytes on this platform");
+GLM_STATIC_ASSERT(sizeof(glm::detail::float64) == 8, "float64 size isn't 8 bytes on this platform");
+
 #endif //glm_glm