mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-14 14:04:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disabled GTX_scalar_multiplication for GCC, failing to build tests #242

Browse Source
This commit is contained in:
Christophe Riccio 2015-01-10 13:45:41 +01:00
parent fe0de059b8
commit 4eec569f92
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glm/detail/setup.hpp
View File

@ -605,8 +605,8 @@
# define GLM_HAS_TEMPLATE_ALIASES 1 # define GLM_HAS_TEMPLATE_ALIASES 1
#else #else
# define GLM_HAS_TEMPLATE_ALIASES (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ # define GLM_HAS_TEMPLATE_ALIASES (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC47)) || \
((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL12_1)) || \ ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL12_1)) || \
((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC47)) || \
((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013))) ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)))
#endif #endif

4
glm/gtx/scalar_multiplication.hpp
View File

@ -43,8 +43,8 @@
#include "../detail/setup.hpp" #include "../detail/setup.hpp"
#if !GLM_HAS_TEMPLATE_ALIASES #if !GLM_HAS_TEMPLATE_ALIASES && !(GLM_COMPILER & GLM_COMPILER_GCC)
# error "GLM_GTX_scalar_multiplication requires C++11 suppport or alias templates" # error "GLM_GTX_scalar_multiplication requires C++11 suppport or alias templates and if not support for GCC"
#endif #endif
#include "../vec2.hpp" #include "../vec2.hpp"

2
readme.txt
View File

@ -72,6 +72,7 @@ Features:
Improvements: Improvements:
- Removed assert for perspective with zFar < zNear #298 - Removed assert for perspective with zFar < zNear #298
- Added Visual Studio natvis support for vec1, quat and dualqual types - Added Visual Studio natvis support for vec1, quat and dualqual types
- Cleaned up C++11 feature detections
Fixes: Fixes:
- Fixed faceforward build #289 - Fixed faceforward build #289
@ -81,6 +82,7 @@ Fixes:
- Fixed warnings in F2x11_1x10 packing function in GTC_packing #295 - Fixed warnings in F2x11_1x10 packing function in GTC_packing #295
- Fixed Visual Studio natvis support for vec4 #288 - Fixed Visual Studio natvis support for vec4 #288
- Fixed GTC_packing *pack*norm*x* build and added tests #292 - Fixed GTC_packing *pack*norm*x* build and added tests #292
- Disabled GTX_scalar_multiplication for GCC #242
================================================================================ ================================================================================
GLM 0.9.6.1: 2014-12-10 GLM 0.9.6.1: 2014-12-10

2
test/gtx/gtx_scalar_multiplication.cpp
View File

@ -31,7 +31,7 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#if GLM_HAS_TEMPLATE_ALIASES #if GLM_HAS_TEMPLATE_ALIASES & !(GLM_COMPILER & GLM_COMPILER_GCC)
#include <glm/gtx/scalar_multiplication.hpp> #include <glm/gtx/scalar_multiplication.hpp>
int main() int main()