Add Windows Implementation Libraries as a submodule

dolphin-emu · Oct 23, 2019 · cd79a97 · cd79a97
1 parent 2c79c63
commit cd79a97
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,3 +2,7 @@
 	path = Externals/Qt
 	url = https://github.com/dolphin-emu/ext-win-qt.git
 	branch = master
+[submodule "Externals/WIL"]
+	path = Externals/WIL
+	url = https://github.com/microsoft/wil.git
+	branch = master
diff --git a/Externals/WIL b/Externals/WIL
diff --git a/Externals/licenses.md b/Externals/licenses.md
@@ -60,6 +60,8 @@ Dolphin includes or links code of the following third-party software projects:
    [LGPLv2+](http://www.surina.net/soundtouch/license.html)
 - [TAP-Windows](https://openvpn.net/):
    header only
+- [Windows Implementation Libraries](https://github.com/microsoft/wil):
+   [MIT](https://github.com/microsoft/wil/blob/master/LICENSE)
 - [xxHash](https://github.com/Cyan4973/xxHash):
    [2-clause BSD](https://github.com/Cyan4973/xxHash/blob/master/LICENSE)
 - [zlib](http://www.zlib.net/):

diff --git a/Source/Core/AudioCommon/CMakeLists.txt b/Source/Core/AudioCommon/CMakeLists.txt
@@ -71,6 +71,11 @@ if(WIN32)
 
     WASAPIStream.cpp
     WASAPIStream.h
+  target_include_directories(audiocommon PRIVATE
+    ${PROJECT_SOURCE_DIR}/Externals/WIL/include
+  )
+  target_compile_definitions(audiocommon PRIVATE WIL_SUPPRESS_EXCEPTIONS)
+
   )
 endif()
 

diff --git a/Source/VSProps/Base.props b/Source/VSProps/Base.props
@@ -53,6 +53,7 @@
       <AdditionalIncludeDirectories>$(ExternalsDir)pugixml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)SFML\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)Vulkan\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ExternalsDir)WIL\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories>$(ExternalsDir)zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HAVE_FFMPEG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -64,6 +65,7 @@
       <PreprocessorDefinitions>USE_ANALYTICS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions>USE_DISCORD_PRESENCE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions>CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIL_SUPPRESS_EXCEPTIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">_ARCH_64=1;_M_X86_64=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <!--
       Make sure we include a clean version of windows.h.