Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-11-25 15:15:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build: Use shared discord-rpc

Browse source
This commit is contained in:
Stenzek 2024-07-04 14:23:11 +10:00
parent f35397cf8d
commit 00d2d862c2
No known key found for this signature in database
8 changed files with 7 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeModules/DuckStationDependencies.cmake
View file

@ -17,6 +17,7 @@ find_package(PNG 1.6.40 REQUIRED)
find_package(JPEG REQUIRED) # No version because flatpak uses libjpeg-turbo. find_package(JPEG REQUIRED) # No version because flatpak uses libjpeg-turbo.
find_package(Freetype 2.11.1 REQUIRED) find_package(Freetype 2.11.1 REQUIRED)
find_package(cpuinfo REQUIRED) find_package(cpuinfo REQUIRED)
find_package(DiscordRPC 3.4.0 REQUIRED)
if(NOT WIN32) if(NOT WIN32)
find_package(CURL REQUIRED) find_package(CURL REQUIRED)

2
dep/CMakeLists.txt
View file

@ -28,8 +28,6 @@ disable_compiler_warnings_for_target(rapidyaml)
add_subdirectory(cubeb EXCLUDE_FROM_ALL) add_subdirectory(cubeb EXCLUDE_FROM_ALL)
disable_compiler_warnings_for_target(cubeb) disable_compiler_warnings_for_target(cubeb)
disable_compiler_warnings_for_target(speex) disable_compiler_warnings_for_target(speex)
add_subdirectory(discord-rpc EXCLUDE_FROM_ALL)
disable_compiler_warnings_for_target(discord-rpc)
add_subdirectory(kissfft EXCLUDE_FROM_ALL) add_subdirectory(kissfft EXCLUDE_FROM_ALL)
disable_compiler_warnings_for_target(kissfft) disable_compiler_warnings_for_target(kissfft)
add_subdirectory(freesurround EXCLUDE_FROM_ALL) add_subdirectory(freesurround EXCLUDE_FROM_ALL)

31
duckstation.sln
View file

@ -36,8 +36,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common-tests", "src\common-
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scmversion", "src\scmversion\scmversion.vcxproj", "{075CED82-6A20-46DF-94C7-9624AC9DDBEB}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scmversion", "src\scmversion\scmversion.vcxproj", "{075CED82-6A20-46DF-94C7-9624AC9DDBEB}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "discord-rpc", "dep\discord-rpc\discord-rpc.vcxproj", "{4266505B-DBAF-484B-AB31-B53B9C8235B3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "updater", "src\updater\updater.vcxproj", "{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "updater", "src\updater\updater.vcxproj", "{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vixl", "dep\vixl\vixl.vcxproj", "{8906836E-F06E-46E8-B11A-74E5E8C7B8FB}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vixl", "dep\vixl\vixl.vcxproj", "{8906836E-F06E-46E8-B11A-74E5E8C7B8FB}"
@ -466,34 +464,6 @@ Global
{075CED82-6A20-46DF-94C7-9624AC9DDBEB}.ReleaseLTCG-Clang|ARM64.Build.0 = ReleaseLTCG-Clang|ARM64 {075CED82-6A20-46DF-94C7-9624AC9DDBEB}.ReleaseLTCG-Clang|ARM64.Build.0 = ReleaseLTCG-Clang|ARM64
{075CED82-6A20-46DF-94C7-9624AC9DDBEB}.ReleaseLTCG-Clang|x64.ActiveCfg = ReleaseLTCG-Clang|x64 {075CED82-6A20-46DF-94C7-9624AC9DDBEB}.ReleaseLTCG-Clang|x64.ActiveCfg = ReleaseLTCG-Clang|x64
{075CED82-6A20-46DF-94C7-9624AC9DDBEB}.ReleaseLTCG-Clang|x64.Build.0 = ReleaseLTCG-Clang|x64 {075CED82-6A20-46DF-94C7-9624AC9DDBEB}.ReleaseLTCG-Clang|x64.Build.0 = ReleaseLTCG-Clang|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.Debug|ARM64.ActiveCfg = Debug|ARM64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.Debug|x64.ActiveCfg = Debug|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.Debug|x64.Build.0 = Debug|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.Debug-Clang|ARM64.ActiveCfg = Debug-Clang|ARM64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.Debug-Clang|ARM64.Build.0 = Debug-Clang|ARM64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.Debug-Clang|x64.ActiveCfg = Debug-Clang|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.Debug-Clang|x64.Build.0 = Debug-Clang|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.DebugFast|ARM64.ActiveCfg = DebugFast|ARM64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.DebugFast|x64.ActiveCfg = DebugFast|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.DebugFast|x64.Build.0 = DebugFast|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.DebugFast-Clang|ARM64.ActiveCfg = DebugFast-Clang|ARM64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.DebugFast-Clang|ARM64.Build.0 = DebugFast-Clang|ARM64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.DebugFast-Clang|x64.ActiveCfg = DebugFast-Clang|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.DebugFast-Clang|x64.Build.0 = DebugFast-Clang|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.Release|ARM64.ActiveCfg = Release|ARM64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.Release|x64.ActiveCfg = Release|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.Release|x64.Build.0 = Release|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.Release-Clang|ARM64.ActiveCfg = Release-Clang|ARM64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.Release-Clang|ARM64.Build.0 = Release-Clang|ARM64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.Release-Clang|x64.ActiveCfg = Release-Clang|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.Release-Clang|x64.Build.0 = Release-Clang|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.ReleaseLTCG|ARM64.ActiveCfg = ReleaseLTCG|ARM64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.ReleaseLTCG-Clang|ARM64.ActiveCfg = ReleaseLTCG-Clang|ARM64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.ReleaseLTCG-Clang|ARM64.Build.0 = ReleaseLTCG-Clang|ARM64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.ReleaseLTCG-Clang|x64.ActiveCfg = ReleaseLTCG-Clang|x64
{4266505B-DBAF-484B-AB31-B53B9C8235B3}.ReleaseLTCG-Clang|x64.Build.0 = ReleaseLTCG-Clang|x64
{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug|ARM64.ActiveCfg = Debug|ARM64 {32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug|ARM64.ActiveCfg = Debug|ARM64
{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug|x64.ActiveCfg = Debug|x64 {32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug|x64.ActiveCfg = Debug|x64
{32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug-Clang|ARM64.ActiveCfg = Debug-Clang|ARM64 {32EEAF44-57F8-4C6C-A6F0-DE5667123DD5}.Debug-Clang|ARM64.ActiveCfg = Debug-Clang|ARM64
@ -864,7 +834,6 @@ Global
{DD944834-7899-4C1C-A4C1-064B5009D239} = {BA490C0E-497D-4634-A21E-E65012006385} {DD944834-7899-4C1C-A4C1-064B5009D239} = {BA490C0E-497D-4634-A21E-E65012006385}
{09553C96-9F39-49BF-8AE6-7ACBD07C410C} = {BA490C0E-497D-4634-A21E-E65012006385} {09553C96-9F39-49BF-8AE6-7ACBD07C410C} = {BA490C0E-497D-4634-A21E-E65012006385}
{49953E1B-2EF7-46A4-B88B-1BF9E099093B} = {BA490C0E-497D-4634-A21E-E65012006385} {49953E1B-2EF7-46A4-B88B-1BF9E099093B} = {BA490C0E-497D-4634-A21E-E65012006385}
{4266505B-DBAF-484B-AB31-B53B9C8235B3} = {BA490C0E-497D-4634-A21E-E65012006385}
{8906836E-F06E-46E8-B11A-74E5E8C7B8FB} = {BA490C0E-497D-4634-A21E-E65012006385} {8906836E-F06E-46E8-B11A-74E5E8C7B8FB} = {BA490C0E-497D-4634-A21E-E65012006385}
{4BA0A6D4-3AE1-42B2-9347-096FD023FF64} = {BA490C0E-497D-4634-A21E-E65012006385} {4BA0A6D4-3AE1-42B2-9347-096FD023FF64} = {BA490C0E-497D-4634-A21E-E65012006385}
{E4357877-D459-45C7-B8F6-DCBB587BB528} = {BA490C0E-497D-4634-A21E-E65012006385} {E4357877-D459-45C7-B8F6-DCBB587BB528} = {BA490C0E-497D-4634-A21E-E65012006385}

2
src/core/CMakeLists.txt
View file

@ -184,7 +184,7 @@ endif()
if(NOT ANDROID) if(NOT ANDROID)
target_compile_definitions(core PUBLIC -DENABLE_DISCORD_PRESENCE=1) target_compile_definitions(core PUBLIC -DENABLE_DISCORD_PRESENCE=1)
target_link_libraries(core PRIVATE discord-rpc) target_link_libraries(core PRIVATE DiscordRPC::discord-rpc)
endif() endif()
# Copy the provided data directory to the output directory. Borrowed from PCSX2. # Copy the provided data directory to the output directory. Borrowed from PCSX2.

2
src/core/core.props
View file

@ -10,7 +10,7 @@
<PreprocessorDefinitions Condition="('$(Platform)'=='x64' Or '$(Platform)'=='ARM64')">ENABLE_MMAP_FASTMEM=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="('$(Platform)'=='x64' Or '$(Platform)'=='ARM64')">ENABLE_MMAP_FASTMEM=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="('$(Platform)'=='x64' Or '$(Platform)'=='ARM64')">ENABLE_NEWREC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="('$(Platform)'=='x64' Or '$(Platform)'=='ARM64')">ENABLE_NEWREC=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)dep\zlib\include;$(SolutionDir)dep\rcheevos\include;$(SolutionDir)dep\discord-rpc\include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)dep\zlib\include;$(SolutionDir)dep\rcheevos\include</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions);C4_NO_DEBUG_BREAK=1</PreprocessorDefinitions> <PreprocessorDefinitions>%(PreprocessorDefinitions);C4_NO_DEBUG_BREAK=1</PreprocessorDefinitions>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)dep\rapidyaml\include;$(SolutionDir)dep\rapidjson\include</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)dep\rapidyaml\include;$(SolutionDir)dep\rapidjson\include</AdditionalIncludeDirectories>

3
src/core/core.vcxproj
View file

@ -169,9 +169,6 @@
<ClInclude Include="types.h" /> <ClInclude Include="types.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\dep\discord-rpc\discord-rpc.vcxproj">
<Project>{4266505b-dbaf-484b-ab31-b53b9c8235b3}</Project>
</ProjectReference>
<ProjectReference Include="..\..\dep\imgui\imgui.vcxproj"> <ProjectReference Include="..\..\dep\imgui\imgui.vcxproj">
<Project>{bb08260f-6fbc-46af-8924-090ee71360c6}</Project> <Project>{bb08260f-6fbc-46af-8924-090ee71360c6}</Project>
</ProjectReference> </ProjectReference>

3
src/duckstation-qt/CMakeLists.txt
View file

@ -207,7 +207,8 @@ if(WIN32)
) )
#set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/translations") #set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/translations")
set(DEPS_TO_COPY cpuinfo.dll freetype.dll harfbuzz.dll libjpeg.dll libpng16.dll libsharpyuv.dll libwebp.dll SDL2.dll shaderc_shared.dll spirv-cross-c-shared.dll zlib1.dll zstd.dll) set(DEPS_TO_COPY cpuinfo.dll discord-rpc.dll freetype.dll harfbuzz.dll libjpeg.dll libpng16.dll libsharpyuv.dll libwebp.dll
SDL2.dll shaderc_shared.dll spirv-cross-c-shared.dll zlib1.dll zstd.dll)
foreach(DEP ${DEPS_TO_COPY}) foreach(DEP ${DEPS_TO_COPY})
list(APPEND DEP_BINS "${CMAKE_PREFIX_PATH}/bin/${DEP}") list(APPEND DEP_BINS "${CMAKE_PREFIX_PATH}/bin/${DEP}")
endforeach() endforeach()

3
src/util/util.props
View file

@ -27,11 +27,12 @@
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DepsIncludeDir)SDL2</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DepsIncludeDir)SDL2</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>%(AdditionalDependencies);cpuinfo.lib;freetype.lib;libjpeg.lib;libpng16.lib;libwebp.lib;SDL2.lib;zlib.lib;zstd.lib</AdditionalDependencies> <AdditionalDependencies>%(AdditionalDependencies);cpuinfo.lib;discord-rpc.lib;freetype.lib;libjpeg.lib;libpng16.lib;libwebp.lib;SDL2.lib;zlib.lib;zstd.lib</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<DepsDLLs Include="$(DepsBinDir)cpuinfo.dll" /> <DepsDLLs Include="$(DepsBinDir)cpuinfo.dll" />
<DepsDLLs Include="$(DepsBinDir)discord-rpc.dll" />
<DepsDLLs Include="$(DepsBinDir)freetype.dll" /> <DepsDLLs Include="$(DepsBinDir)freetype.dll" />
<DepsDLLs Include="$(DepsBinDir)harfbuzz.dll" /> <DepsDLLs Include="$(DepsBinDir)harfbuzz.dll" />
<DepsDLLs Include="$(DepsBinDir)libjpeg.dll" /> <DepsDLLs Include="$(DepsBinDir)libjpeg.dll" />