Home Explore Help
Sign In
cpp
/
glm
mirror of https://github.com/g-truc/glm.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Fixed error to cover deprecated define

Christophe Riccio 9 years ago
parent
8bfefbd1ce
commit
e77c300e4c
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      glm/detail/setup.hpp

+ 1 - 1
glm/detail/setup.hpp
View File 

@@ -3,7 +3,7 @@
 
 
 
 #pragma once
 
 #pragma once
 
 
 
-#if defined(GLM_FORCE_SWIZZLE) && defined(GLM_FORCE_UNRESTRICTED_GENTYPE)
 
+#if (defined(GLM_FORCE_SWIZZLE) || defined(GLM_SWIZZLE)) && defined(GLM_FORCE_UNRESTRICTED_GENTYPE)
 
 #	error "Both GLM_FORCE_SWIZZLE and GLM_FORCE_UNRESTRICTED_GENTYPE can't be defined at the same time"
 
 #	error "Both GLM_FORCE_SWIZZLE and GLM_FORCE_UNRESTRICTED_GENTYPE can't be defined at the same time"
 
 #endif
 
 #endif