From a609a0fea6c5e5a23fa12b5dbb89baeacc2af7ee Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 2 Sep 2016 00:30:37 +0200 Subject: [PATCH] - Added more information to build messages --- glm/detail/setup.hpp | 88 ++++++++++++++++++++++------- glm/ext.hpp | 4 +- glm/glm.hpp | 2 +- glm/gtc/bitfield.hpp | 2 +- glm/gtc/color_space.hpp | 2 +- glm/gtc/constants.hpp | 2 +- glm/gtc/epsilon.hpp | 2 +- glm/gtc/functions.hpp | 2 +- glm/gtc/integer.hpp | 2 +- glm/gtc/matrix_access.hpp | 2 +- glm/gtc/matrix_integer.hpp | 2 +- glm/gtc/matrix_inverse.hpp | 2 +- glm/gtc/matrix_transform.hpp | 2 +- glm/gtc/noise.hpp | 2 +- glm/gtc/packing.hpp | 2 +- glm/gtc/quaternion.hpp | 2 +- glm/gtc/random.hpp | 2 +- glm/gtc/reciprocal.hpp | 2 +- glm/gtc/round.hpp | 2 +- glm/gtc/type_aligned.hpp | 6 +- glm/gtc/type_precision.hpp | 2 +- glm/gtc/type_ptr.hpp | 2 +- glm/gtc/ulp.hpp | 2 +- glm/gtc/vec1.hpp | 2 +- glm/gtx/associated_min_max.hpp | 2 +- glm/gtx/bit.hpp | 2 +- glm/gtx/closest_point.hpp | 2 +- glm/gtx/color_space.hpp | 2 +- glm/gtx/color_space_YCoCg.hpp | 2 +- glm/gtx/common.hpp | 2 +- glm/gtx/compatibility.hpp | 6 +- glm/gtx/component_wise.hpp | 2 +- glm/gtx/dual_quaternion.hpp | 2 +- glm/gtx/euler_angles.hpp | 2 +- glm/gtx/extend.hpp | 2 +- glm/gtx/extended_min_max.hpp | 2 +- glm/gtx/fast_exponential.hpp | 2 +- glm/gtx/fast_square_root.hpp | 2 +- glm/gtx/fast_trigonometry.hpp | 2 +- glm/gtx/gradient_paint.hpp | 2 +- glm/gtx/handed_coordinate_space.hpp | 2 +- glm/gtx/integer.hpp | 2 +- glm/gtx/intersect.hpp | 2 +- glm/gtx/io.hpp | 2 +- glm/gtx/log_base.hpp | 2 +- glm/gtx/matrix_cross_product.hpp | 2 +- glm/gtx/matrix_decompose.hpp | 2 +- glm/gtx/matrix_interpolation.hpp | 2 +- glm/gtx/matrix_major_storage.hpp | 2 +- glm/gtx/matrix_operation.hpp | 2 +- glm/gtx/matrix_query.hpp | 2 +- glm/gtx/matrix_transform_2d.hpp | 2 +- glm/gtx/mixed_product.hpp | 2 +- glm/gtx/norm.hpp | 2 +- glm/gtx/normal.hpp | 2 +- glm/gtx/normalize_dot.hpp | 2 +- glm/gtx/number_precision.hpp | 2 +- glm/gtx/optimum_pow.hpp | 2 +- glm/gtx/orthonormalize.hpp | 2 +- glm/gtx/perpendicular.hpp | 2 +- glm/gtx/polar_coordinates.hpp | 2 +- glm/gtx/projection.hpp | 2 +- glm/gtx/quaternion.hpp | 2 +- glm/gtx/raw_data.hpp | 2 +- glm/gtx/rotate_normalized_axis.hpp | 2 +- glm/gtx/rotate_vector.hpp | 2 +- glm/gtx/scalar_relational.hpp | 2 +- glm/gtx/simd_mat4.hpp | 2 +- glm/gtx/simd_quat.hpp | 8 +-- glm/gtx/simd_vec4.hpp | 2 +- glm/gtx/spline.hpp | 2 +- glm/gtx/std_based_type.hpp | 2 +- glm/gtx/string_cast.hpp | 2 +- glm/gtx/transform.hpp | 2 +- glm/gtx/transform2.hpp | 2 +- glm/gtx/type_aligned.hpp | 2 +- glm/gtx/type_trait.hpp | 2 +- glm/gtx/vector_angle.hpp | 2 +- glm/gtx/vector_query.hpp | 2 +- glm/gtx/wrap.hpp | 2 +- glm/simd/platform.h | 2 +- readme.md | 2 + test/core/core_func_integer.cpp | 6 +- test/core/core_func_swizzle.cpp | 2 +- test/core/core_setup_message.cpp | 2 +- test/gtc/gtc_type_aligned.cpp | 2 +- 86 files changed, 165 insertions(+), 113 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index c89739892..1d1e18d39 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -3,6 +3,24 @@ #pragma once +/////////////////////////////////////////////////////////////////////////////////// +// Messages + +#ifdef GLM_MESSAGES +# pragma message("GLM: GLM_MESSAGES is deprecated, use GLM_FORCE_MESSAGES instead") +#endif + +#define GLM_MESSAGES_ENABLED 1 +#define GLM_MESSAGES_DISABLE 0 + +#if defined(GLM_FORCE_MESSAGES) || defined(GLM_MESSAGES) +# undef GLM_MESSAGES +# define GLM_MESSAGES GLM_MESSAGES_ENABLED +#else +# undef GLM_MESSAGES +# define GLM_MESSAGES GLM_MESSAGES_DISABLE +#endif + #include #include #include "../simd/platform.h" @@ -16,13 +34,13 @@ #define GLM_VERSION_PATCH 8 #define GLM_VERSION_REVISION 0 -#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_VERSION_DISPLAYED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_VERSION_DISPLAYED) # define GLM_MESSAGE_VERSION_DISPLAYED # pragma message ("GLM: version 0.9.8.0") #endif//GLM_MESSAGES // Report compiler detection -#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_COMPILER_DISPLAYED) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_COMPILER_DISPLAYED) # define GLM_MESSAGE_COMPILER_DISPLAYED # if GLM_COMPILER & GLM_COMPILER_CUDA # pragma message("GLM: CUDA compiler detected") @@ -54,7 +72,7 @@ # error "GLM_MODEL undefined, your compiler may not be supported by GLM. Add #define GLM_MODEL 0 to ignore this message." #endif//GLM_MODEL -#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_MODEL_DISPLAYED) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_MODEL_DISPLAYED) # define GLM_MESSAGE_MODEL_DISPLAYED # if(GLM_MODEL == GLM_MODEL_64) # pragma message("GLM: 64 bits model") @@ -63,7 +81,7 @@ # endif//GLM_MODEL #endif//GLM_MESSAGES -#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_ARCH_DISPLAYED) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_ARCH_DISPLAYED) # define GLM_MESSAGE_ARCH_DISPLAYED # if(GLM_ARCH == GLM_ARCH_PURE) # pragma message("GLM: Platform independent code") @@ -230,7 +248,7 @@ # endif #endif -#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_LANG_DISPLAYED) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_LANG_DISPLAYED) # define GLM_MESSAGE_LANG_DISPLAYED # if GLM_LANG & GLM_LANG_CXX1Z_FLAG @@ -526,17 +544,22 @@ // User defines: GLM_FORCE_SWIZZLE -#define GLM_SWIZZLE_ENABLED 1 -#define GLM_SWIZZLE_DISABLE 0 -#if defined(GLM_FORCE_SWIZZLE) || defined(GLM_SWIZZLE) -#undef GLM_SWIZZLE -#define GLM_SWIZZLE GLM_SWIZZLE_ENABLED -#else -#undef GLM_SWIZZLE -#define GLM_SWIZZLE GLM_SWIZZLE_DISABLE +#ifdef GLM_SWIZZLE +# pragma message("GLM: GLM_SWIZZLE is deprecated, use GLM_FORCE_SWIZZLE instead") #endif -#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_SWIZZLE_DISPLAYED) +#define GLM_SWIZZLE_ENABLED 1 +#define GLM_SWIZZLE_DISABLE 0 + +#if defined(GLM_FORCE_SWIZZLE) || defined(GLM_SWIZZLE) +# undef GLM_SWIZZLE +# define GLM_SWIZZLE GLM_SWIZZLE_ENABLED +#else +# undef GLM_SWIZZLE +# define GLM_SWIZZLE GLM_SWIZZLE_DISABLE +#endif + +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_SWIZZLE_DISPLAYED) # define GLM_MESSAGE_SWIZZLE_DISPLAYED # if GLM_SWIZZLE == GLM_SWIZZLE_ENABLED # pragma message("GLM: Swizzling operators enabled") @@ -545,6 +568,18 @@ # endif #endif//GLM_MESSAGES +/////////////////////////////////////////////////////////////////////////////////// +// Allows using not basic types as genType + +// #define GLM_FORCE_UNRESTRICTED_GENTYPE + +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_UNRESTRICTED_GENTYPE_DISPLAYED) +# define GLM_MESSAGE_UNRESTRICTED_GENTYPE_DISPLAYED +# ifdef GLM_FORCE_UNRESTRICTED_GENTYPE +# pragma message("GLM: Use unrestricted genType") +# endif +#endif//GLM_MESSAGES + /////////////////////////////////////////////////////////////////////////////////// // Clip control @@ -561,10 +596,14 @@ # define GLM_DEPTH_CLIP_SPACE GLM_DEPTH_NEGATIVE_ONE_TO_ONE #endif -/////////////////////////////////////////////////////////////////////////////////// -// Allows using not basic types as genType - -// #define GLM_FORCE_UNRESTRICTED_GENTYPE +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_DEPTH_DISPLAYED) +# define GLM_MESSAGE_DEPTH_DISPLAYED +# if GLM_DEPTH_CLIP_SPACE == GLM_DEPTH_ZERO_TO_ONE +# pragma message("GLM: Depth clip space: Zero to one") +# else +# pragma message("GLM: Depth clip space: negative one to one") +# endif +#endif//GLM_MESSAGES /////////////////////////////////////////////////////////////////////////////////// // Coordinate system, define GLM_FORCE_LEFT_HANDED before including GLM @@ -581,7 +620,16 @@ # define GLM_COORDINATE_SYSTEM GLM_LEFT_HANDED #else # define GLM_COORDINATE_SYSTEM GLM_RIGHT_HANDED -#endif +#endif + +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_HANDED_DISPLAYED) +# define GLM_MESSAGE_HANDED_DISPLAYED +# if GLM_COORDINATE_SYSTEM == GLM_LEFT_HANDED +# pragma message("GLM: Coordinate system: left handed") +# else +# pragma message("GLM: Coordinate system: right handed") +# endif +#endif//GLM_MESSAGES /////////////////////////////////////////////////////////////////////////////////// // Qualifiers @@ -689,7 +737,7 @@ namespace glm # endif }//namespace glm -#if defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_FORCE_SIZE_T_LENGTH) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_FORCE_SIZE_T_LENGTH) # define GLM_MESSAGE_FORCE_SIZE_T_LENGTH # if defined GLM_FORCE_SIZE_T_LENGTH # pragma message("GLM: .length() returns glm::length_t, a typedef of std::size_t") diff --git a/glm/ext.hpp b/glm/ext.hpp index dee032e37..ca2e9e824 100644 --- a/glm/ext.hpp +++ b/glm/ext.hpp @@ -27,7 +27,9 @@ #pragma once -#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_EXT_INCLUDED_DISPLAYED)) +#include "glm.hpp" + +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_EXT_INCLUDED_DISPLAYED) # define GLM_MESSAGE_EXT_INCLUDED_DISPLAYED # pragma message("GLM: All extensions included (not recommanded)") #endif//GLM_MESSAGES diff --git a/glm/glm.hpp b/glm/glm.hpp index c6a82f852..021a3609f 100644 --- a/glm/glm.hpp +++ b/glm/glm.hpp @@ -60,7 +60,7 @@ #include #include "fwd.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_CORE_INCLUDED_DISPLAYED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_CORE_INCLUDED_DISPLAYED) # define GLM_MESSAGE_CORE_INCLUDED_DISPLAYED # pragma message("GLM: Core library included") #endif//GLM_MESSAGES diff --git a/glm/gtc/bitfield.hpp b/glm/gtc/bitfield.hpp index 47214d352..38a38b695 100644 --- a/glm/gtc/bitfield.hpp +++ b/glm/gtc/bitfield.hpp @@ -20,7 +20,7 @@ #include "../detail/_vectorize.hpp" #include -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_bitfield extension included") #endif diff --git a/glm/gtc/color_space.hpp b/glm/gtc/color_space.hpp index 327fa79c5..636e5ed8f 100644 --- a/glm/gtc/color_space.hpp +++ b/glm/gtc/color_space.hpp @@ -21,7 +21,7 @@ #include "../vec4.hpp" #include -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_color_space extension included") #endif diff --git a/glm/gtc/constants.hpp b/glm/gtc/constants.hpp index 8c82a7c2f..d3358c761 100644 --- a/glm/gtc/constants.hpp +++ b/glm/gtc/constants.hpp @@ -16,7 +16,7 @@ // Dependencies #include "../detail/setup.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_constants extension included") #endif diff --git a/glm/gtc/epsilon.hpp b/glm/gtc/epsilon.hpp index a76aaaf72..289f5b74a 100644 --- a/glm/gtc/epsilon.hpp +++ b/glm/gtc/epsilon.hpp @@ -18,7 +18,7 @@ #include "../detail/setup.hpp" #include "../detail/precision.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_epsilon extension included") #endif diff --git a/glm/gtc/functions.hpp b/glm/gtc/functions.hpp index d94496430..ab1590b49 100644 --- a/glm/gtc/functions.hpp +++ b/glm/gtc/functions.hpp @@ -19,7 +19,7 @@ #include "../detail/precision.hpp" #include "../detail/type_vec2.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_functions extension included") #endif diff --git a/glm/gtc/integer.hpp b/glm/gtc/integer.hpp index a863f4cbc..69ffb1d3b 100644 --- a/glm/gtc/integer.hpp +++ b/glm/gtc/integer.hpp @@ -21,7 +21,7 @@ #include "../detail/func_exponential.hpp" #include -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_integer extension included") #endif diff --git a/glm/gtc/matrix_access.hpp b/glm/gtc/matrix_access.hpp index 87f80fbb4..e4156ef44 100644 --- a/glm/gtc/matrix_access.hpp +++ b/glm/gtc/matrix_access.hpp @@ -14,7 +14,7 @@ // Dependency: #include "../detail/setup.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_matrix_access extension included") #endif diff --git a/glm/gtc/matrix_integer.hpp b/glm/gtc/matrix_integer.hpp index 2d070ff8e..fdc816d5f 100644 --- a/glm/gtc/matrix_integer.hpp +++ b/glm/gtc/matrix_integer.hpp @@ -22,7 +22,7 @@ #include "../mat4x3.hpp" #include "../mat4x4.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_matrix_integer extension included") #endif diff --git a/glm/gtc/matrix_inverse.hpp b/glm/gtc/matrix_inverse.hpp index a34cb7a9d..589381d47 100644 --- a/glm/gtc/matrix_inverse.hpp +++ b/glm/gtc/matrix_inverse.hpp @@ -18,7 +18,7 @@ #include "../mat3x3.hpp" #include "../mat4x4.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_matrix_inverse extension included") #endif diff --git a/glm/gtc/matrix_transform.hpp b/glm/gtc/matrix_transform.hpp index 3c949dd97..c97b89a6d 100644 --- a/glm/gtc/matrix_transform.hpp +++ b/glm/gtc/matrix_transform.hpp @@ -27,7 +27,7 @@ #include "../vec4.hpp" #include "../gtc/constants.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_matrix_transform extension included") #endif diff --git a/glm/gtc/noise.hpp b/glm/gtc/noise.hpp index d31a0e42a..aec4f18dd 100644 --- a/glm/gtc/noise.hpp +++ b/glm/gtc/noise.hpp @@ -26,7 +26,7 @@ #include "../vec3.hpp" #include "../vec4.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_noise extension included") #endif diff --git a/glm/gtc/packing.hpp b/glm/gtc/packing.hpp index a46081a7c..1389d9595 100644 --- a/glm/gtc/packing.hpp +++ b/glm/gtc/packing.hpp @@ -16,7 +16,7 @@ // Dependency: #include "type_precision.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_packing extension included") #endif diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index fee13db71..87deebf39 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -21,7 +21,7 @@ #include "../vec4.hpp" #include "../gtc/constants.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_quaternion extension included") #endif diff --git a/glm/gtc/random.hpp b/glm/gtc/random.hpp index 250b5d0b4..fa3956e52 100644 --- a/glm/gtc/random.hpp +++ b/glm/gtc/random.hpp @@ -18,7 +18,7 @@ #include "../vec2.hpp" #include "../vec3.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_random extension included") #endif diff --git a/glm/gtc/reciprocal.hpp b/glm/gtc/reciprocal.hpp index 6b18db7af..c14a4fece 100644 --- a/glm/gtc/reciprocal.hpp +++ b/glm/gtc/reciprocal.hpp @@ -15,7 +15,7 @@ // Dependencies #include "../detail/setup.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_reciprocal extension included") #endif diff --git a/glm/gtc/round.hpp b/glm/gtc/round.hpp index 45a975953..a58359218 100644 --- a/glm/gtc/round.hpp +++ b/glm/gtc/round.hpp @@ -21,7 +21,7 @@ #include "../common.hpp" #include -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_integer extension included") #endif diff --git a/glm/gtc/type_aligned.hpp b/glm/gtc/type_aligned.hpp index 0a75dd048..2e4503c3a 100644 --- a/glm/gtc/type_aligned.hpp +++ b/glm/gtc/type_aligned.hpp @@ -9,15 +9,15 @@ /// @brief Aligned types. /// need to be included to use these features. +#pragma once + #if !GLM_HAS_ALIGNED_TYPE # error "GLM: Aligned types are not supported on this platform" #endif -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_type_aligned extension included") #endif -#pragma once - #include "../vec2.hpp" #include "../vec3.hpp" #include "../vec4.hpp" diff --git a/glm/gtc/type_precision.hpp b/glm/gtc/type_precision.hpp index 8b920b194..a2dbb66a0 100644 --- a/glm/gtc/type_precision.hpp +++ b/glm/gtc/type_precision.hpp @@ -33,7 +33,7 @@ #include "../mat4x3.hpp" #include "../mat4x4.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_type_precision extension included") #endif diff --git a/glm/gtc/type_ptr.hpp b/glm/gtc/type_ptr.hpp index b171dd953..008665e2c 100644 --- a/glm/gtc/type_ptr.hpp +++ b/glm/gtc/type_ptr.hpp @@ -49,7 +49,7 @@ #include "../mat4x4.hpp" #include -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_type_ptr extension included") #endif diff --git a/glm/gtc/ulp.hpp b/glm/gtc/ulp.hpp index 632f4a35f..a82fa4e73 100644 --- a/glm/gtc/ulp.hpp +++ b/glm/gtc/ulp.hpp @@ -18,7 +18,7 @@ #include "../detail/precision.hpp" #include "../detail/type_int.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_ulp extension included") #endif diff --git a/glm/gtc/vec1.hpp b/glm/gtc/vec1.hpp index 02479181b..f84ff97ce 100644 --- a/glm/gtc/vec1.hpp +++ b/glm/gtc/vec1.hpp @@ -15,7 +15,7 @@ #include "../glm.hpp" #include "../detail/type_vec1.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTC_vec1 extension included") #endif diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp index e5aa6c281..eb9d72105 100644 --- a/glm/gtx/associated_min_max.hpp +++ b/glm/gtx/associated_min_max.hpp @@ -15,7 +15,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_associated_min_max extension included") #endif diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp index b07b4b652..17378f35c 100644 --- a/glm/gtx/bit.hpp +++ b/glm/gtx/bit.hpp @@ -16,7 +16,7 @@ // Dependencies #include "../gtc/bitfield.hpp" -#if(defined(GLM_MESSAGES)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_bit extension is deprecated, include GLM_GTC_bitfield and GLM_GTC_integer instead") #endif diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp index ab720d5c6..8d435b819 100644 --- a/glm/gtx/closest_point.hpp +++ b/glm/gtx/closest_point.hpp @@ -15,7 +15,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_closest_point extension included") #endif diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp index c814638e4..9ff08dced 100644 --- a/glm/gtx/color_space.hpp +++ b/glm/gtx/color_space.hpp @@ -15,7 +15,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_color_space extension included") #endif diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp index 01c1e4297..428ca6d29 100644 --- a/glm/gtx/color_space_YCoCg.hpp +++ b/glm/gtx/color_space_YCoCg.hpp @@ -15,7 +15,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_color_space_YCoCg extension included") #endif diff --git a/glm/gtx/common.hpp b/glm/gtx/common.hpp index 8d7d32914..6533a54e9 100644 --- a/glm/gtx/common.hpp +++ b/glm/gtx/common.hpp @@ -19,7 +19,7 @@ #include "../vec4.hpp" #include "../gtc/vec1.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_common extension included") #endif diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp index 8b194bc9b..9f4819aef 100644 --- a/glm/gtx/compatibility.hpp +++ b/glm/gtx/compatibility.hpp @@ -17,13 +17,13 @@ #include "../glm.hpp" #include "../gtc/quaternion.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_compatibility extension included") #endif -#if(GLM_COMPILER & GLM_COMPILER_VC) +#if GLM_COMPILER & GLM_COMPILER_VC # include -#elif(GLM_COMPILER & GLM_COMPILER_GCC) +#elif GLM_COMPILER & GLM_COMPILER_GCC # include # if(GLM_PLATFORM & GLM_PLATFORM_ANDROID) # undef isfinite diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp index 7d6265b7d..c316f9e27 100644 --- a/glm/gtx/component_wise.hpp +++ b/glm/gtx/component_wise.hpp @@ -18,7 +18,7 @@ #include "../detail/setup.hpp" #include "../detail/precision.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_component_wise extension included") #endif diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp index 27febf988..a64c7df76 100644 --- a/glm/gtx/dual_quaternion.hpp +++ b/glm/gtx/dual_quaternion.hpp @@ -21,7 +21,7 @@ #include "../gtc/constants.hpp" #include "../gtc/quaternion.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_dual_quaternion extension included") #endif diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp index 13e6dd3d6..fdc4f26cc 100644 --- a/glm/gtx/euler_angles.hpp +++ b/glm/gtx/euler_angles.hpp @@ -16,7 +16,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_euler_angles extension included") #endif diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp index dbd49747d..26837a839 100644 --- a/glm/gtx/extend.hpp +++ b/glm/gtx/extend.hpp @@ -15,7 +15,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_extend extension included") #endif diff --git a/glm/gtx/extended_min_max.hpp b/glm/gtx/extended_min_max.hpp index 7d10dbc2e..f4d885953 100644 --- a/glm/gtx/extended_min_max.hpp +++ b/glm/gtx/extended_min_max.hpp @@ -16,7 +16,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_extented_min_max extension included") #endif diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp index 126e07914..ed64a27d7 100644 --- a/glm/gtx/fast_exponential.hpp +++ b/glm/gtx/fast_exponential.hpp @@ -16,7 +16,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_fast_exponential extension included") #endif diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp index e83fa4e67..35aa7f3b4 100644 --- a/glm/gtx/fast_square_root.hpp +++ b/glm/gtx/fast_square_root.hpp @@ -19,7 +19,7 @@ #include "../exponential.hpp" #include "../geometric.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_fast_square_root extension included") #endif diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp index 6d222130c..ccb1d2271 100644 --- a/glm/gtx/fast_trigonometry.hpp +++ b/glm/gtx/fast_trigonometry.hpp @@ -15,7 +15,7 @@ // Dependency: #include "../gtc/constants.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_fast_trigonometry extension included") #endif diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp index c080caa8d..de1f18d39 100644 --- a/glm/gtx/gradient_paint.hpp +++ b/glm/gtx/gradient_paint.hpp @@ -16,7 +16,7 @@ #include "../glm.hpp" #include "../gtx/optimum_pow.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_gradient_paint extension included") #endif diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp index b13ade832..2ee5175e8 100644 --- a/glm/gtx/handed_coordinate_space.hpp +++ b/glm/gtx/handed_coordinate_space.hpp @@ -15,7 +15,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_handed_coordinate_space extension included") #endif diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp index 9bab73c3d..1173a58e8 100644 --- a/glm/gtx/integer.hpp +++ b/glm/gtx/integer.hpp @@ -16,7 +16,7 @@ #include "../glm.hpp" #include "../gtc/integer.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_integer extension included") #endif diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp index 146b62816..33b6e99ba 100644 --- a/glm/gtx/intersect.hpp +++ b/glm/gtx/intersect.hpp @@ -21,7 +21,7 @@ #include "../gtx/closest_point.hpp" #include "../gtx/vector_query.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_closest_point extension included") #endif diff --git a/glm/gtx/io.hpp b/glm/gtx/io.hpp index e79f6ddf4..52b27a8fe 100644 --- a/glm/gtx/io.hpp +++ b/glm/gtx/io.hpp @@ -23,7 +23,7 @@ #include "../glm.hpp" #include "../gtx/quaternion.hpp" -#if(defined(GLM_MESSAGES) && !defined(glm_ext)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_io extension included") #endif diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp index dfed8b068..7958fc3ec 100644 --- a/glm/gtx/log_base.hpp +++ b/glm/gtx/log_base.hpp @@ -15,7 +15,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_log_base extension included") #endif diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp index 9f1dcaa5d..d920f4ef0 100644 --- a/glm/gtx/matrix_cross_product.hpp +++ b/glm/gtx/matrix_cross_product.hpp @@ -16,7 +16,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_matrix_cross_product extension included") #endif diff --git a/glm/gtx/matrix_decompose.hpp b/glm/gtx/matrix_decompose.hpp index 233b9e8c3..e163f5a35 100644 --- a/glm/gtx/matrix_decompose.hpp +++ b/glm/gtx/matrix_decompose.hpp @@ -20,7 +20,7 @@ #include "../gtc/quaternion.hpp" #include "../gtc/matrix_transform.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_matrix_decompose extension included") #endif diff --git a/glm/gtx/matrix_interpolation.hpp b/glm/gtx/matrix_interpolation.hpp index ef4d8b10a..77a69eac6 100644 --- a/glm/gtx/matrix_interpolation.hpp +++ b/glm/gtx/matrix_interpolation.hpp @@ -16,7 +16,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_matrix_interpolation extension included") #endif diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp index 3bf2f2234..9402abee7 100644 --- a/glm/gtx/matrix_major_storage.hpp +++ b/glm/gtx/matrix_major_storage.hpp @@ -16,7 +16,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_matrix_major_storage extension included") #endif diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp index d6f7a9eaa..3192ae54c 100644 --- a/glm/gtx/matrix_operation.hpp +++ b/glm/gtx/matrix_operation.hpp @@ -15,7 +15,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_matrix_operation extension included") #endif diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp index f8f486af3..251827417 100644 --- a/glm/gtx/matrix_query.hpp +++ b/glm/gtx/matrix_query.hpp @@ -18,7 +18,7 @@ #include "../gtx/vector_query.hpp" #include -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_matrix_query extension included") #endif diff --git a/glm/gtx/matrix_transform_2d.hpp b/glm/gtx/matrix_transform_2d.hpp index afc53a0c3..91f4834e6 100644 --- a/glm/gtx/matrix_transform_2d.hpp +++ b/glm/gtx/matrix_transform_2d.hpp @@ -18,7 +18,7 @@ #include "../vec2.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_matrix_transform_2d extension included") #endif diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp index a2b08ede6..65861f721 100644 --- a/glm/gtx/mixed_product.hpp +++ b/glm/gtx/mixed_product.hpp @@ -15,7 +15,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_mixed_product extension included") #endif diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp index 209ca6445..b3cb52830 100644 --- a/glm/gtx/norm.hpp +++ b/glm/gtx/norm.hpp @@ -17,7 +17,7 @@ #include "../detail/func_geometric.hpp" #include "../gtx/quaternion.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_norm extension included") #endif diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp index 5c7efddd9..2e0044e37 100644 --- a/glm/gtx/normal.hpp +++ b/glm/gtx/normal.hpp @@ -16,7 +16,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_normal extension included") #endif diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp index b207555ed..de650d30c 100644 --- a/glm/gtx/normalize_dot.hpp +++ b/glm/gtx/normalize_dot.hpp @@ -16,7 +16,7 @@ // Dependency: #include "../gtx/fast_square_root.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_normalize_dot extension included") #endif diff --git a/glm/gtx/number_precision.hpp b/glm/gtx/number_precision.hpp index 13f6ade22..736d03510 100644 --- a/glm/gtx/number_precision.hpp +++ b/glm/gtx/number_precision.hpp @@ -18,7 +18,7 @@ #include "../glm.hpp" #include "../gtc/type_precision.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_number_precision extension included") #endif diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp index eced3cbeb..e9510c41d 100644 --- a/glm/gtx/optimum_pow.hpp +++ b/glm/gtx/optimum_pow.hpp @@ -15,7 +15,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_optimum_pow extension included") #endif diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp index 2529dda5b..4bea44970 100644 --- a/glm/gtx/orthonormalize.hpp +++ b/glm/gtx/orthonormalize.hpp @@ -18,7 +18,7 @@ #include "../mat3x3.hpp" #include "../geometric.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_orthonormalize extension included") #endif diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp index 880ab04ba..8b6260a9b 100644 --- a/glm/gtx/perpendicular.hpp +++ b/glm/gtx/perpendicular.hpp @@ -17,7 +17,7 @@ #include "../glm.hpp" #include "../gtx/projection.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_perpendicular extension included") #endif diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp index a915544eb..c647c0faa 100644 --- a/glm/gtx/polar_coordinates.hpp +++ b/glm/gtx/polar_coordinates.hpp @@ -15,7 +15,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_polar_coordinates extension included") #endif diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp index aad3c879d..fcddae870 100644 --- a/glm/gtx/projection.hpp +++ b/glm/gtx/projection.hpp @@ -15,7 +15,7 @@ // Dependency: #include "../geometric.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_projection extension included") #endif diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp index 69e8519be..674d7e755 100644 --- a/glm/gtx/quaternion.hpp +++ b/glm/gtx/quaternion.hpp @@ -19,7 +19,7 @@ #include "../gtc/quaternion.hpp" #include "../gtx/norm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_quaternion extension included") #endif diff --git a/glm/gtx/raw_data.hpp b/glm/gtx/raw_data.hpp index 0530e934c..2625fd11e 100644 --- a/glm/gtx/raw_data.hpp +++ b/glm/gtx/raw_data.hpp @@ -16,7 +16,7 @@ #include "../detail/setup.hpp" #include "../detail/type_int.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_raw_data extension included") #endif diff --git a/glm/gtx/rotate_normalized_axis.hpp b/glm/gtx/rotate_normalized_axis.hpp index d5a9503d3..f1dfa7b8c 100644 --- a/glm/gtx/rotate_normalized_axis.hpp +++ b/glm/gtx/rotate_normalized_axis.hpp @@ -19,7 +19,7 @@ #include "../gtc/epsilon.hpp" #include "../gtc/quaternion.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_rotate_normalized_axis extension included") #endif diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp index 85b674659..91d1784d9 100644 --- a/glm/gtx/rotate_vector.hpp +++ b/glm/gtx/rotate_vector.hpp @@ -17,7 +17,7 @@ #include "../glm.hpp" #include "../gtx/transform.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_rotate_vector extension included") #endif diff --git a/glm/gtx/scalar_relational.hpp b/glm/gtx/scalar_relational.hpp index 171cfe712..969571657 100644 --- a/glm/gtx/scalar_relational.hpp +++ b/glm/gtx/scalar_relational.hpp @@ -15,7 +15,7 @@ // Dependency: #include "../glm.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_extend extension included") #endif diff --git a/glm/gtx/simd_mat4.hpp b/glm/gtx/simd_mat4.hpp index 3a0b003bd..a68220c23 100644 --- a/glm/gtx/simd_mat4.hpp +++ b/glm/gtx/simd_mat4.hpp @@ -24,7 +24,7 @@ # error "GLM: GLM_GTX_simd_mat4 requires compiler support of SSE2 through intrinsics" #endif -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_simd_mat4 extension included") # pragma message("GLM: GLM_GTX_simd_mat4 extension is deprecated and will be removed in GLM 0.9.9. Use mat4 instead and use compiler SIMD arguments.") #endif diff --git a/glm/gtx/simd_quat.hpp b/glm/gtx/simd_quat.hpp index f92260bab..b13401988 100644 --- a/glm/gtx/simd_quat.hpp +++ b/glm/gtx/simd_quat.hpp @@ -17,15 +17,15 @@ #include "../gtc/quaternion.hpp" #include "../gtx/fast_trigonometry.hpp" -#if(GLM_ARCH != GLM_ARCH_PURE) +#if GLM_ARCH != GLM_ARCH_PURE -#if(GLM_ARCH & GLM_ARCH_SSE2_BIT) -# include "../gtx/simd_mat4.hpp" +#if GLM_ARCH & GLM_ARCH_SSE2_BIT +# include "../gtx/simd_mat4.hpp" #else # error "GLM: GLM_GTX_simd_quat requires compiler support of SSE2 through intrinsics" #endif -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_simd_quat extension included") # pragma message("GLM: GLM_GTX_simd_quat extension is deprecated and will be removed in GLM 0.9.9. Use GLM_GTC_quaternion instead and use compiler SIMD arguments.") #endif diff --git a/glm/gtx/simd_vec4.hpp b/glm/gtx/simd_vec4.hpp index 793437831..cde540bb8 100644 --- a/glm/gtx/simd_vec4.hpp +++ b/glm/gtx/simd_vec4.hpp @@ -25,7 +25,7 @@ # error "GLM: GLM_GTX_simd_vec4 requires compiler support of SSE2 through intrinsics" #endif -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_simd_vec4 extension included") # pragma message("GLM: GLM_GTX_simd_vec4 extension is deprecated and will be removed in GLM 0.9.9. Use *vec4 types instead and use compiler SIMD arguments.") #endif diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp index 4e256533e..333a5bce1 100644 --- a/glm/gtx/spline.hpp +++ b/glm/gtx/spline.hpp @@ -16,7 +16,7 @@ #include "../glm.hpp" #include "../gtx/optimum_pow.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_spline extension included") #endif diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp index 8b3cce764..ea1791b3c 100644 --- a/glm/gtx/std_based_type.hpp +++ b/glm/gtx/std_based_type.hpp @@ -16,7 +16,7 @@ #include "../glm.hpp" #include -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_std_based_type extension included") #endif diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp index 9558d278e..d2b9fc6a7 100644 --- a/glm/gtx/string_cast.hpp +++ b/glm/gtx/string_cast.hpp @@ -27,7 +27,7 @@ # error "GLM_GTX_string_cast is not supported on CUDA compiler" #endif -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_string_cast extension included") #endif diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp index ee5309c93..365748b9e 100644 --- a/glm/gtx/transform.hpp +++ b/glm/gtx/transform.hpp @@ -19,7 +19,7 @@ #include "../glm.hpp" #include "../gtc/matrix_transform.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_transform extension included") #endif diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp index c1973b9e1..bf5fbc9ee 100644 --- a/glm/gtx/transform2.hpp +++ b/glm/gtx/transform2.hpp @@ -17,7 +17,7 @@ #include "../glm.hpp" #include "../gtx/transform.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_transform2 extension included") #endif diff --git a/glm/gtx/type_aligned.hpp b/glm/gtx/type_aligned.hpp index 39446cfe3..8962a6f8d 100644 --- a/glm/gtx/type_aligned.hpp +++ b/glm/gtx/type_aligned.hpp @@ -18,7 +18,7 @@ // Dependency: #include "../gtc/type_precision.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_type_aligned extension included") #endif diff --git a/glm/gtx/type_trait.hpp b/glm/gtx/type_trait.hpp index 2e703d1be..0207a06d4 100644 --- a/glm/gtx/type_trait.hpp +++ b/glm/gtx/type_trait.hpp @@ -28,7 +28,7 @@ #include "../gtc/quaternion.hpp" #include "../gtx/dual_quaternion.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_type_trait extension included") #endif diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp index 99398c141..d52d3f83f 100644 --- a/glm/gtx/vector_angle.hpp +++ b/glm/gtx/vector_angle.hpp @@ -20,7 +20,7 @@ #include "../gtx/quaternion.hpp" #include "../gtx/rotate_vector.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_vector_angle extension included") #endif diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp index 3e21014b4..2c0d0227c 100644 --- a/glm/gtx/vector_query.hpp +++ b/glm/gtx/vector_query.hpp @@ -17,7 +17,7 @@ #include #include -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_vector_query extension included") #endif diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp index 146088f58..00600732f 100644 --- a/glm/gtx/wrap.hpp +++ b/glm/gtx/wrap.hpp @@ -16,7 +16,7 @@ #include "../glm.hpp" #include "../gtc/vec1.hpp" -#if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_EXT_INCLUDED) # pragma message("GLM: GLM_GTX_wrap extension included") #endif diff --git a/glm/simd/platform.h b/glm/simd/platform.h index 9a3ef72aa..85eb4b5af 100644 --- a/glm/simd/platform.h +++ b/glm/simd/platform.h @@ -43,7 +43,7 @@ #endif// // Report platform detection -#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_PLATFORM_DISPLAYED)) +#if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_PLATFORM_DISPLAYED) # define GLM_MESSAGE_PLATFORM_DISPLAYED # if(GLM_PLATFORM & GLM_PLATFORM_QNXNTO) # pragma message("GLM: QNX platform detected") diff --git a/readme.md b/readme.md index 04ab2e46a..9df865175 100644 --- a/readme.md +++ b/readme.md @@ -84,6 +84,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) - Use Cuda built-in function for abs function implementation with Cuda compiler - Factorized GLM_COMPILER_LLVM and GLM_COMPILER_APPLE_CLANG into GLM_COMPILER_CLANG - No more warnings for use of long long +- Added more information to build messages ##### Fixes: - Fixed GTX_extended_min_max filename typo #386 @@ -101,6 +102,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) - Deprecated GLM_GTX_simd_mat4 extension - Deprecated GLM_GTX_simd_quat extension - Deprecated GLM_SWIZZLE, use GLM_FORCE_SWIZZLE instead +- Deprecated GLM_MESSAGES, use GLM_FORCE_MESSAGES instead -------------------------------------------------------------------------------- #### [GLM 0.9.7.6](https://github.com/g-truc/glm/releases/tag/0.9.7.6) - 2016-07-16 diff --git a/test/core/core_func_integer.cpp b/test/core/core_func_integer.cpp index 49f8dbee1..c44153d81 100644 --- a/test/core/core_func_integer.cpp +++ b/test/core/core_func_integer.cpp @@ -529,8 +529,8 @@ namespace bitfieldReverse { int Error = 0; - Error += perf32(Samples); - Error += perf64(Samples); + Error += perf32(static_cast(Samples)); + Error += perf64(static_cast(Samples)); return Error; } @@ -1459,7 +1459,7 @@ namespace bitCount // bitCount - TimeIf { for(std::size_t i = 0, n = v.size(); i < n; ++i) - v[i] = bitCount_if(i); + v[i] = bitCount_if(static_cast(i)); } std::clock_t TimestampsB = std::clock(); diff --git a/test/core/core_func_swizzle.cpp b/test/core/core_func_swizzle.cpp index c12ed47bb..dfd6c8afe 100644 --- a/test/core/core_func_swizzle.cpp +++ b/test/core/core_func_swizzle.cpp @@ -1,4 +1,4 @@ -#define GLM_MESSAGES +#define GLM_FORCE_MESSAGES #define GLM_FORCE_SWIZZLE #include diff --git a/test/core/core_setup_message.cpp b/test/core/core_setup_message.cpp index 2aae39405..7eaf70287 100644 --- a/test/core/core_setup_message.cpp +++ b/test/core/core_setup_message.cpp @@ -1,4 +1,4 @@ -#define GLM_MESSAGES +#define GLM_FORCE_MESSAGES #include #include diff --git a/test/gtc/gtc_type_aligned.cpp b/test/gtc/gtc_type_aligned.cpp index 351a39589..a3ba7b814 100644 --- a/test/gtc/gtc_type_aligned.cpp +++ b/test/gtc/gtc_type_aligned.cpp @@ -1,4 +1,4 @@ -#define GLM_MESSAGES +#define GLM_FORCE_MESSAGES #include #if GLM_HAS_ALIGNED_TYPE