ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

external/glm: work around missing clang-cl #pragma support

Browse Source 
Change-Id: I596dc0e2306e7170e65c77a1635f88407272e6b1
This commit is contained in:
Stephan Bergmann
2015-12-02 08:02:26 +01:00
parent abe87fdfe7
commit 7ae1c3520a
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
external/glm/UnpackedTarball_glm.mk
Vendored
+1
View File
@@ -19,6 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,glm, \
external/glm/Wshadow-patch-fix.patch \
external/glm/Wsign-compare.patch.0 \
external/glm/Wunused-parameter.patch \
external/glm/clang-cl.patch.0 \
))
# vim: set noet sw=4 ts=4:
external/glm/clang-cl.patch.0
Vendored
+14
View File
@@ -0,0 +1,14 @@
# "#pragma intrinsic" not (yet?) handled in the "if (LangOpts.MicrosoftExt)"
# block in Preprocessor::RegisterBuiltinPragmas in Clang's lib/Lex/Pragma.cpp:
--- glm/core/func_integer.inl
+++ glm/core/func_integer.inl
@@ -29,7 +29,9 @@
#if(GLM_ARCH != GLM_ARCH_PURE)
#if(GLM_COMPILER & GLM_COMPILER_VC)
# include <intrin.h>
+#if !defined __clang__
# pragma intrinsic(_BitScanReverse)
+#endif
#endif//(GLM_COMPILER & GLM_COMPILER_VC)
#endif//(GLM_ARCH != GLM_ARCH_PURE)