diff --git a/.gitmodules b/.gitmodules index 29aab79441..c032dba973 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,3 +18,7 @@ path = 3rdparty/libchdr/libchdr url = https://github.com/rtissera/libchdr.git shallow = true +[submodule "3rdparty/wil"] + path = 3rdparty/wil + url = https://github.com/microsoft/wil.git + branch = master diff --git a/3rdparty/wil b/3rdparty/wil new file mode 160000 index 0000000000..3018875eaa --- /dev/null +++ b/3rdparty/wil @@ -0,0 +1 @@ +Subproject commit 3018875eaa4f8e3d86cf2da97fd577bae59f3aec diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index 932a4e7869..798ea8ed44 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -15,6 +15,7 @@ if (WIN32) add_subdirectory(3rdparty/portaudio EXCLUDE_FROM_ALL) add_subdirectory(3rdparty/pthreads4w EXCLUDE_FROM_ALL) add_subdirectory(3rdparty/soundtouch EXCLUDE_FROM_ALL) + add_subdirectory(3rdparty/wil EXCLUDE_FROM_ALL) add_subdirectory(3rdparty/wxwidgets3.0 EXCLUDE_FROM_ALL) add_subdirectory(3rdparty/xz EXCLUDE_FROM_ALL) else() diff --git a/common/vsprops/3rdpartyDeps.props b/common/vsprops/3rdpartyDeps.props index 0eb19ad429..873e4f2631 100644 --- a/common/vsprops/3rdpartyDeps.props +++ b/common/vsprops/3rdpartyDeps.props @@ -6,7 +6,8 @@ - $(SolutionDir)3rdparty\;$(SolutionDir)3rdparty\soundtouch\soundtouch\;$(SolutionDir)3rdparty\yaml-cpp\yaml-cpp\include\;$(SolutionDir)3rdparty\fmt\fmt\include\;$(SolutionDir)3rdparty\libchdr\libchdr\include;$(SolutionDir)3rdparty\include\;%(AdditionalIncludeDirectories) + $(SolutionDir)3rdparty\;$(SolutionDir)3rdparty\soundtouch\soundtouch\;$(SolutionDir)3rdparty\yaml-cpp\yaml-cpp\include\;$(SolutionDir)3rdparty\fmt\fmt\include\;$(SolutionDir)3rdparty\libchdr\libchdr\include;$(SolutionDir)3rdparty\wil\include;$(SolutionDir)3rdparty\include\;%(AdditionalIncludeDirectories) + WIL_SUPPRESS_EXCEPTIONS;%(PreprocessorDefinitions) $(SolutionDir)deps\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories) diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 6257a9a34f..8652ec4f6a 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -88,6 +88,7 @@ if(WIN32) WIN32_LEAN_AND_MEAN LZMA_API_STATIC BUILD_DX=1 + WIL_SUPPRESS_EXCEPTIONS ) target_include_directories(PCSX2 PRIVATE ../3rdparty # GL headers @@ -1456,6 +1457,7 @@ if(WIN32) target_link_libraries(PCSX2 PRIVATE baseclasses pthreads4w + WIL::WIL setupapi.lib ws2_32.lib shlwapi.lib