|
@@ -142,7 +142,7 @@
|
|
|
// Android has multiple STLs but C++11 STL detection doesn't always work #284 #564
|
|
// Android has multiple STLs but C++11 STL detection doesn't always work #284 #564
|
|
|
#if GLM_PLATFORM == GLM_PLATFORM_ANDROID && !defined(GLM_LANG_STL11_FORCED)
|
|
#if GLM_PLATFORM == GLM_PLATFORM_ANDROID && !defined(GLM_LANG_STL11_FORCED)
|
|
|
# define GLM_HAS_CXX11_STL 0
|
|
# define GLM_HAS_CXX11_STL 0
|
|
|
-#elif GLM_COMPILER & GLM_COMPILER_CUDA_RTC
|
|
|
|
|
|
|
+#elif (GLM_COMPILER & GLM_COMPILER_CUDA_RTC) == GLM_COMPILER_CUDA_RTC
|
|
|
# define GLM_HAS_CXX11_STL 0
|
|
# define GLM_HAS_CXX11_STL 0
|
|
|
#elif GLM_COMPILER & GLM_COMPILER_CLANG
|
|
#elif GLM_COMPILER & GLM_COMPILER_CLANG
|
|
|
# if (defined(_LIBCPP_VERSION) || (GLM_LANG & GLM_LANG_CXX11_FLAG) || defined(GLM_LANG_STL11_FORCED))
|
|
# if (defined(_LIBCPP_VERSION) || (GLM_LANG & GLM_LANG_CXX11_FLAG) || defined(GLM_LANG_STL11_FORCED))
|
Christophe