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

Add GHC Filesystem (#3999) 

Adds GHC filesystem to 3rdparty deps and updates cmake and vs project accordingly.
This commit is contained in:
Timothy O'Barr 2021-01-02 10:47:09 -08:00 committed by GitHub
parent faf147d029
commit bfdfc495a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5693 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5689
3rdparty/include/ghc/filesystem.h vendored Normal file
View File

File diff suppressed because it is too large Load Diff

1
common/build/Utilities/utilities.vcxproj
View File

@ -43,6 +43,7 @@
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Label="PropertySheets">
<Import Project="..\..\vsprops\CommonLibrary.props" />
<Import Project="..\..\vsprops\3rdpartyDeps.props"/>
<Import Project="..\..\vsprops\pthreads.props" />
<Import Condition="$(Configuration.Contains(Debug))" Project="..\..\vsprops\CodeGen_Debug.props" />
<Import Condition="$(Configuration.Contains(Devel))" Project="..\..\vsprops\CodeGen_Devel.props" />

3
common/src/Utilities/CMakeLists.txt
View File

@ -5,7 +5,6 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
endif(NOT TOP_CMAKE_WAS_SOURCED)
set(Output Utilities)
set(CommonFlags
@ -120,6 +119,8 @@ add_pcsx2_lib(${Output}_NO_TLS "${UtilitiesFinalSources}" "${UtilitiesFinalLibs}
target_compile_features(${Output} PUBLIC cxx_std_17)
target_compile_features(${Output}_NO_TLS PUBLIC cxx_std_17)
target_include_directories(${Output} PUBLIC ../../../3rdparty/include)
target_include_directories(${Output}_NO_TLS PUBLIC ../../../3rdparty/include)
if(COMMAND target_precompile_headers)
target_precompile_headers(${Output} PRIVATE PrecompiledHeader.h)

2
common/vsprops/3rdpartyDeps.props
View File

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(SvnRootDir)\3rdparty\;$(SvnRootDir)\3rdparty\soundtouch\;$(SolutionDir)\3rdparty\yaml-cpp\yaml-cpp\include\;$(SolutionDir)\3rdparty\fmt\fmt\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SvnRootDir)\3rdparty\;$(SvnRootDir)\3rdparty\soundtouch\;$(SolutionDir)\3rdparty\yaml-cpp\yaml-cpp\include\;$(SolutionDir)\3rdparty\fmt\fmt\include\;$(SolutionDir)\3rdparty\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(SvnRootDir)\deps\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>