ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

3rdparty: Update wil 

Gets rid of a -Wdeprecated-volatile error.
This commit is contained in:
Stenzek 2023-07-20 00:03:40 +10:00 committed by Connor McLaughlin
parent 7676a74f73
commit 32621a9369
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/wil vendored

@ -1 +1 @@
Subproject commit 3018875eaa4f8e3d86cf2da97fd577bae59f3aec
Subproject commit ae986e12b2fa722ba70e9761ae6897565293cbea

6
cmake/SearchForStuff.cmake
View File

@ -9,11 +9,15 @@ if (WIN32)
add_subdirectory(3rdparty/zlib EXCLUDE_FROM_ALL)
add_subdirectory(3rdparty/libpng EXCLUDE_FROM_ALL)
add_subdirectory(3rdparty/libjpeg EXCLUDE_FROM_ALL)
add_subdirectory(3rdparty/wil EXCLUDE_FROM_ALL)
add_subdirectory(3rdparty/xz EXCLUDE_FROM_ALL)
add_subdirectory(3rdparty/D3D12MemAlloc EXCLUDE_FROM_ALL)
set(FFMPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/3rdparty/ffmpeg/include")
find_package(Vtune)
# Don't try to build tests for WIL, it needs NuGet.
set(WIL_BUILD_TESTS OFF CACHE BOOL "")
set(WIL_BUILD_PACKAGING OFF CACHE BOOL "")
add_subdirectory(3rdparty/wil EXCLUDE_FROM_ALL)
else()
find_package(PCAP REQUIRED)
find_package(LibLZMA REQUIRED)