ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dep: Add build config for fmt

This commit is contained in:
Connor McLaughlin 2022-07-08 19:48:44 +10:00
parent 830f097aad
commit d81e156a29
4 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dep/CMakeLists.txt
View File

@ -1,3 +1,4 @@
add_subdirectory(fmt)
add_subdirectory(glad)
add_subdirectory(stb)
add_subdirectory(zlib)

39
duckstation.sln
View File

@ -103,6 +103,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "duckstation-regtest", "src\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rainterface", "dep\rainterface\rainterface.vcxproj", "{E4357877-D459-45C7-B8F6-DCBB587BB528}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "dep\fmt\fmt.vcxproj", "{8BE398E6-B882-4248-9065-FECC8728E038}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM64 = Debug|ARM64
@ -951,6 +953,42 @@ Global
{E4357877-D459-45C7-B8F6-DCBB587BB528}.ReleaseUWP|x64.Build.0 = ReleaseUWP|x64
{E4357877-D459-45C7-B8F6-DCBB587BB528}.ReleaseUWP|x86.ActiveCfg = ReleaseUWP|Win32
{E4357877-D459-45C7-B8F6-DCBB587BB528}.ReleaseUWP|x86.Build.0 = ReleaseUWP|Win32
{8BE398E6-B882-4248-9065-FECC8728E038}.Debug|ARM64.ActiveCfg = Debug|ARM64
{8BE398E6-B882-4248-9065-FECC8728E038}.Debug|ARM64.Build.0 = Debug|ARM64
{8BE398E6-B882-4248-9065-FECC8728E038}.Debug|x64.ActiveCfg = Debug|x64
{8BE398E6-B882-4248-9065-FECC8728E038}.Debug|x64.Build.0 = Debug|x64
{8BE398E6-B882-4248-9065-FECC8728E038}.Debug|x86.ActiveCfg = Debug|Win32
{8BE398E6-B882-4248-9065-FECC8728E038}.Debug|x86.Build.0 = Debug|Win32
{8BE398E6-B882-4248-9065-FECC8728E038}.DebugFast|ARM64.ActiveCfg = DebugFast|ARM64
{8BE398E6-B882-4248-9065-FECC8728E038}.DebugFast|ARM64.Build.0 = DebugFast|ARM64
{8BE398E6-B882-4248-9065-FECC8728E038}.DebugFast|x64.ActiveCfg = DebugFast|x64
{8BE398E6-B882-4248-9065-FECC8728E038}.DebugFast|x64.Build.0 = DebugFast|x64
{8BE398E6-B882-4248-9065-FECC8728E038}.DebugFast|x86.ActiveCfg = DebugFast|Win32
{8BE398E6-B882-4248-9065-FECC8728E038}.DebugFast|x86.Build.0 = DebugFast|Win32
{8BE398E6-B882-4248-9065-FECC8728E038}.DebugUWP|ARM64.ActiveCfg = DebugUWP|ARM64
{8BE398E6-B882-4248-9065-FECC8728E038}.DebugUWP|ARM64.Build.0 = DebugUWP|ARM64
{8BE398E6-B882-4248-9065-FECC8728E038}.DebugUWP|x64.ActiveCfg = DebugUWP|x64
{8BE398E6-B882-4248-9065-FECC8728E038}.DebugUWP|x64.Build.0 = DebugUWP|x64
{8BE398E6-B882-4248-9065-FECC8728E038}.DebugUWP|x86.ActiveCfg = DebugUWP|Win32
{8BE398E6-B882-4248-9065-FECC8728E038}.DebugUWP|x86.Build.0 = DebugUWP|Win32
{8BE398E6-B882-4248-9065-FECC8728E038}.Release|ARM64.ActiveCfg = Release|ARM64
{8BE398E6-B882-4248-9065-FECC8728E038}.Release|ARM64.Build.0 = Release|ARM64
{8BE398E6-B882-4248-9065-FECC8728E038}.Release|x64.ActiveCfg = Release|x64
{8BE398E6-B882-4248-9065-FECC8728E038}.Release|x64.Build.0 = Release|x64
{8BE398E6-B882-4248-9065-FECC8728E038}.Release|x86.ActiveCfg = Release|Win32
{8BE398E6-B882-4248-9065-FECC8728E038}.Release|x86.Build.0 = Release|Win32
{8BE398E6-B882-4248-9065-FECC8728E038}.ReleaseLTCG|ARM64.ActiveCfg = ReleaseLTCG|ARM64
{8BE398E6-B882-4248-9065-FECC8728E038}.ReleaseLTCG|ARM64.Build.0 = ReleaseLTCG|ARM64
{8BE398E6-B882-4248-9065-FECC8728E038}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64
{8BE398E6-B882-4248-9065-FECC8728E038}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64
{8BE398E6-B882-4248-9065-FECC8728E038}.ReleaseLTCG|x86.ActiveCfg = ReleaseLTCG|Win32
{8BE398E6-B882-4248-9065-FECC8728E038}.ReleaseLTCG|x86.Build.0 = ReleaseLTCG|Win32
{8BE398E6-B882-4248-9065-FECC8728E038}.ReleaseUWP|ARM64.ActiveCfg = ReleaseUWP|ARM64
{8BE398E6-B882-4248-9065-FECC8728E038}.ReleaseUWP|ARM64.Build.0 = ReleaseUWP|ARM64
{8BE398E6-B882-4248-9065-FECC8728E038}.ReleaseUWP|x64.ActiveCfg = ReleaseUWP|x64
{8BE398E6-B882-4248-9065-FECC8728E038}.ReleaseUWP|x64.Build.0 = ReleaseUWP|x64
{8BE398E6-B882-4248-9065-FECC8728E038}.ReleaseUWP|x86.ActiveCfg = ReleaseUWP|Win32
{8BE398E6-B882-4248-9065-FECC8728E038}.ReleaseUWP|x86.Build.0 = ReleaseUWP|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -975,6 +1013,7 @@ Global
{39F0ADFF-3A84-470D-9CF0-CA49E164F2F3} = {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}
{8BE398E6-B882-4248-9065-FECC8728E038} = {BA490C0E-497D-4634-A21E-E65012006385}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {26E40B32-7C1D-48D0-95F4-1A500E054028}

4
src/common/common.props
View File

@ -2,13 +2,13 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)dep\libsamplerate\include;$(SolutionDir)dep\glad\include;$(SolutionDir)dep\libcue\include;$(SolutionDir)dep\libchdr\include;$(SolutionDir)dep\stb\include;$(SolutionDir)dep\vulkan-loader\include;$(SolutionDir)dep\glslang;$(SolutionDir)dep\zlib\include;$(SolutionDir)dep\minizip\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)dep\fmt\include;$(SolutionDir)dep\libsamplerate\include;$(SolutionDir)dep\glad\include;$(SolutionDir)dep\libcue\include;$(SolutionDir)dep\libchdr\include;$(SolutionDir)dep\stb\include;$(SolutionDir)dep\vulkan-loader\include;$(SolutionDir)dep\glslang;$(SolutionDir)dep\zlib\include;$(SolutionDir)dep\minizip\include;$(SolutionDir)src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup>
<Link>
<AdditionalDependencies>$(RootBuildDir)glad\glad.lib;$(RootBuildDir)glslang\glslang.lib;$(RootBuildDir)libchdr\libchdr.lib;$(RootBuildDir)zlib\zlib.lib;$(RootBuildDir)minizip\minizip.lib;$(RootBuildDir)lzma\lzma.lib;$(RootBuildDir)libsamplerate\libsamplerate.lib;d3dcompiler.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>$(RootBuildDir)fmt\fmt.lib;$(RootBuildDir)glad\glad.lib;$(RootBuildDir)glslang\glslang.lib;$(RootBuildDir)libchdr\libchdr.lib;$(RootBuildDir)zlib\zlib.lib;$(RootBuildDir)minizip\minizip.lib;$(RootBuildDir)lzma\lzma.lib;$(RootBuildDir)libsamplerate\libsamplerate.lib;d3dcompiler.lib;d3d11.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
</Project>

1
src/updater/updater.vcxproj
View File

@ -30,6 +30,7 @@
</PropertyGroup>
<Import Project="..\..\dep\msvc\vsprops\Win32Application.props" />
<Import Project="..\common\common.props" />
<ItemDefinitionGroup>
<ClCompile>