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

Add Windows Implementation Libraries

This commit is contained in:
Silent 2021-07-06 20:12:40 +02:00 committed by Kojin
parent 0a7b725340
commit ed62ae124b
5 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -18,3 +18,7 @@
path = 3rdparty/libchdr/libchdr path = 3rdparty/libchdr/libchdr
url = https://github.com/rtissera/libchdr.git url = https://github.com/rtissera/libchdr.git
shallow = true shallow = true
[submodule "3rdparty/wil"]
path = 3rdparty/wil
url = https://github.com/microsoft/wil.git
branch = master

1
3rdparty/wil vendored Submodule

@ -0,0 +1 @@
Subproject commit 3018875eaa4f8e3d86cf2da97fd577bae59f3aec

1
cmake/SearchForStuff.cmake
View File

@ -15,6 +15,7 @@ if (WIN32)
add_subdirectory(3rdparty/portaudio EXCLUDE_FROM_ALL) add_subdirectory(3rdparty/portaudio EXCLUDE_FROM_ALL)
add_subdirectory(3rdparty/pthreads4w EXCLUDE_FROM_ALL) add_subdirectory(3rdparty/pthreads4w EXCLUDE_FROM_ALL)
add_subdirectory(3rdparty/soundtouch 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/wxwidgets3.0 EXCLUDE_FROM_ALL)
add_subdirectory(3rdparty/xz EXCLUDE_FROM_ALL) add_subdirectory(3rdparty/xz EXCLUDE_FROM_ALL)
else() else()

3
common/vsprops/3rdpartyDeps.props
View File

@ -6,7 +6,8 @@
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<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\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <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)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIL_SUPPRESS_EXCEPTIONS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalLibraryDirectories>$(SolutionDir)deps\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>$(SolutionDir)deps\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

2
pcsx2/CMakeLists.txt
View File

@ -88,6 +88,7 @@ if(WIN32)
WIN32_LEAN_AND_MEAN WIN32_LEAN_AND_MEAN
LZMA_API_STATIC LZMA_API_STATIC
BUILD_DX=1 BUILD_DX=1
WIL_SUPPRESS_EXCEPTIONS
) )
target_include_directories(PCSX2 PRIVATE target_include_directories(PCSX2 PRIVATE
../3rdparty # GL headers ../3rdparty # GL headers
@ -1456,6 +1457,7 @@ if(WIN32)
target_link_libraries(PCSX2 PRIVATE target_link_libraries(PCSX2 PRIVATE
baseclasses baseclasses
pthreads4w pthreads4w
WIL::WIL
setupapi.lib setupapi.lib
ws2_32.lib ws2_32.lib
shlwapi.lib shlwapi.lib