dep/vixl: Fix build with clang-cl

3 years ago · 9fc736eaa0
parent 60cd1d540c
commit 9fc736eaa0
2 changed files with 2 additions and 1 deletions
--- a/dep/vixl/include/vixl/utils-vixl.h
+++ b/dep/vixl/include/vixl/utils-vixl.h
@ -48,7 +48,7 @@ namespace vixl {
 #ifdef __GNUC__
 #define VIXL_HAS_DEPRECATED_WITH_MSG
 #elif defined(__clang__)
-#ifdef __has_extension(attribute_deprecated_with_message)
+#if __has_extension(attribute_deprecated_with_message)
 #define VIXL_HAS_DEPRECATED_WITH_MSG
 #endif
 #endif
--- a/dep/vixl/vixl.vcxproj
+++ b/dep/vixl/vixl.vcxproj
@ -156,6 +156,7 @@
      <WarningLevel>TurnOffAllWarnings</WarningLevel>
      <PreprocessorDefinitions>$(VixlPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <AdditionalIncludeDirectories>$(ProjectDir)include;$(ProjectDir)include\vixl;$(VixlIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions Condition="$(Configuration.Contains(Clang))"> -Wno-deprecated-enum-enum-conversion %(AdditionalOptions)</AdditionalOptions>
    </ClCompile>
  </ItemDefinitionGroup>