From d5753fe37a82127bf0bc29b2e8fcfc268f34e4fb Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 19 Dec 2014 21:05:05 +0100 Subject: [PATCH] Added display of GLM version with other GLM_MESSAGES --- glm/detail/setup.hpp | 7 ++++++- readme.txt | 12 +++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 09a8f535..e4b51d54 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -42,7 +42,12 @@ #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 6 -#define GLM_VERSION_REVISION 1 +#define GLM_VERSION_REVISION 2 + +#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_VERSION_DISPLAYED)) +# define GLM_MESSAGE_VERSION_DISPLAYED +# pragma message ("GLM: version 0.9.6.2") +#endif//GLM_MESSAGE /////////////////////////////////////////////////////////////////////////////////// // Platform diff --git a/readme.txt b/readme.txt index ad389120..bb447cdf 100644 --- a/readme.txt +++ b/readme.txt @@ -6,7 +6,7 @@ GLM is licensed under The Happy Bunny License and MIT License ================================================================================ The Happy Bunny License (Modified MIT License) -------------------------------------------------------------------------------- -Copyright (c) 2005 - 2014 G-Truc Creation +Copyright (c) 2005 - 2015 G-Truc Creation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -33,7 +33,7 @@ THE SOFTWARE. ================================================================================ The MIT License -------------------------------------------------------------------------------- -Copyright (c) 2005 - 2014 G-Truc Creation +Copyright (c) 2005 - 2015 G-Truc Creation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -62,6 +62,12 @@ GLM is a header only library, there is nothing to build, just include it. More informations in GLM manual: http://glm.g-truc.net/glm.pdf +================================================================================ +GLM 0.9.6.2: 2015-01-XX +-------------------------------------------------------------------------------- +Features: +- Added display of GLM version with other GLM_MESSAGES + ================================================================================ GLM 0.9.6.1: 2014-12-10 -------------------------------------------------------------------------------- @@ -76,7 +82,7 @@ Fixes: - Fixed scalar uaddCarry build error with Cuda #276 - Fixed C++11 explicit conversion operators detection #282 - Fixed missing explicit convertion when using integer log2 with *vec1 types -- Fixed 64 bits integer GTX_string_cast to_string on VC 32 bit compiler +- Fixed 64 bits integer GTX_string_cast to_string on VC 32 bit compiler - Fixed Android build issue, STL C++11 is not supported by the NDK #284 - Fixed unsupported _BitScanForward64 and _BitScanReverse64 in VC10 - Fixed Visual C++ 32 bit build #283