mewin/glm
1
0
Fork 0
Code Releases 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
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
#else
# 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_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC47)) || \
((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)))
#endif

4
glm/gtx/scalar_multiplication.hpp
View File

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