From d67133b537d3e93ec76bfe5194b28061f82321d3 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 6 Feb 2020 20:55:43 +0900 Subject: [PATCH] Build: Fix DebugFast config for tinyxml2 --- dep/tinyxml2/tinyxml2.vcxproj | 139 ++++++++++++++++++++++++++++++++++ duckstation.sln | 16 ++-- 2 files changed, 147 insertions(+), 8 deletions(-) diff --git a/dep/tinyxml2/tinyxml2.vcxproj b/dep/tinyxml2/tinyxml2.vcxproj index cb4d897f4..64dc91b4c 100644 --- a/dep/tinyxml2/tinyxml2.vcxproj +++ b/dep/tinyxml2/tinyxml2.vcxproj @@ -1,6 +1,14 @@  + + DebugFast + Win32 + + + DebugFast + x64 + Debug Win32 @@ -9,6 +17,14 @@ Debug x64 + + ReleaseLTCG + Win32 + + + ReleaseLTCG + x64 + Release Win32 @@ -37,12 +53,24 @@ v142 NotSet + + StaticLibrary + true + v142 + NotSet + StaticLibrary true v142 NotSet + + StaticLibrary + true + v142 + NotSet + StaticLibrary false @@ -50,6 +78,13 @@ true NotSet + + StaticLibrary + false + v142 + true + NotSet + StaticLibrary false @@ -57,42 +92,81 @@ true NotSet + + StaticLibrary + false + v142 + true + NotSet + + + + + + + + + + + + + $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ $(ProjectName)-$(Platform)-$(Configuration) + + $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ + $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ + $(ProjectName)-$(Platform)-$(Configuration) + $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ $(ProjectName)-$(Platform)-$(Configuration) $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ + + $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ + $(ProjectName)-$(Platform)-$(Configuration) + $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ + $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ $(ProjectName)-$(Platform)-$(Configuration) + + $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ + $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ + $(ProjectName)-$(Platform)-$(Configuration) + $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ $(ProjectName)-$(Platform)-$(Configuration) $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ + + $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ + $(ProjectName)-$(Platform)-$(Configuration) + $(SolutionDir)build\$(ProjectName)-$(Platform)-$(Configuration)\ + @@ -109,6 +183,22 @@ true + + + + + _CRT_SECURE_NO_WARNINGS;_ITERATOR_DEBUG_LEVEL=1;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + ProgramDatabase + $(ProjectDir)include;%(AdditionalIncludeDirectories) + false + stdcpp17 + true + + + true + + @@ -126,6 +216,23 @@ true + + + + + _CRT_SECURE_NO_WARNINGS;_ITERATOR_DEBUG_LEVEL=1;WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + true + ProgramDatabase + $(ProjectDir)include;%(AdditionalIncludeDirectories) + false + stdcpp17 + true + false + + + true + + @@ -142,6 +249,22 @@ true + + + + + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)include;%(AdditionalIncludeDirectories) + stdcpp17 + true + true + + + true + true + true + + @@ -158,6 +281,22 @@ true + + + + + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + $(ProjectDir)include;%(AdditionalIncludeDirectories) + stdcpp17 + true + true + + + true + true + true + + diff --git a/duckstation.sln b/duckstation.sln index 712bfc9a8..041bd6484 100644 --- a/duckstation.sln +++ b/duckstation.sln @@ -183,18 +183,18 @@ Global {933118A9-68C5-47B4-B151-B03C93961623}.Debug|x64.Build.0 = Debug|x64 {933118A9-68C5-47B4-B151-B03C93961623}.Debug|x86.ActiveCfg = Debug|Win32 {933118A9-68C5-47B4-B151-B03C93961623}.Debug|x86.Build.0 = Debug|Win32 - {933118A9-68C5-47B4-B151-B03C93961623}.DebugFast|x64.ActiveCfg = Debug|x64 - {933118A9-68C5-47B4-B151-B03C93961623}.DebugFast|x64.Build.0 = Debug|x64 - {933118A9-68C5-47B4-B151-B03C93961623}.DebugFast|x86.ActiveCfg = Debug|Win32 - {933118A9-68C5-47B4-B151-B03C93961623}.DebugFast|x86.Build.0 = Debug|Win32 + {933118A9-68C5-47B4-B151-B03C93961623}.DebugFast|x64.ActiveCfg = DebugFast|x64 + {933118A9-68C5-47B4-B151-B03C93961623}.DebugFast|x64.Build.0 = DebugFast|x64 + {933118A9-68C5-47B4-B151-B03C93961623}.DebugFast|x86.ActiveCfg = DebugFast|Win32 + {933118A9-68C5-47B4-B151-B03C93961623}.DebugFast|x86.Build.0 = DebugFast|Win32 {933118A9-68C5-47B4-B151-B03C93961623}.Release|x64.ActiveCfg = Release|x64 {933118A9-68C5-47B4-B151-B03C93961623}.Release|x64.Build.0 = Release|x64 {933118A9-68C5-47B4-B151-B03C93961623}.Release|x86.ActiveCfg = Release|Win32 {933118A9-68C5-47B4-B151-B03C93961623}.Release|x86.Build.0 = Release|Win32 - {933118A9-68C5-47B4-B151-B03C93961623}.ReleaseLTCG|x64.ActiveCfg = Release|x64 - {933118A9-68C5-47B4-B151-B03C93961623}.ReleaseLTCG|x64.Build.0 = Release|x64 - {933118A9-68C5-47B4-B151-B03C93961623}.ReleaseLTCG|x86.ActiveCfg = Release|Win32 - {933118A9-68C5-47B4-B151-B03C93961623}.ReleaseLTCG|x86.Build.0 = Release|Win32 + {933118A9-68C5-47B4-B151-B03C93961623}.ReleaseLTCG|x64.ActiveCfg = ReleaseLTCG|x64 + {933118A9-68C5-47B4-B151-B03C93961623}.ReleaseLTCG|x64.Build.0 = ReleaseLTCG|x64 + {933118A9-68C5-47B4-B151-B03C93961623}.ReleaseLTCG|x86.ActiveCfg = ReleaseLTCG|Win32 + {933118A9-68C5-47B4-B151-B03C93961623}.ReleaseLTCG|x86.Build.0 = ReleaseLTCG|Win32 {28F14272-0EC4-41BB-849F-182ADB81AF70}.Debug|x64.ActiveCfg = Debug|x64 {28F14272-0EC4-41BB-849F-182ADB81AF70}.Debug|x64.Build.0 = Debug|x64 {28F14272-0EC4-41BB-849F-182ADB81AF70}.Debug|x86.ActiveCfg = Debug|Win32