From 0ced155a2437dfe7e4d7ccd31e2b2637d97c5986 Mon Sep 17 00:00:00 2001 From: dantmnf Date: Sun, 23 Apr 2023 01:36:02 +0800 Subject: [PATCH] chore: add Debug configuration --- CMakeLists.txt | 4 +- MAA.sln | 44 ++--- src/Cpp/MaaSample.vcxproj | 86 ++++++++++ src/MaaCore/MaaCore.vcxproj | 154 +++++++++++++++++- src/MaaWpfGui/MaaWpfGui.csproj | 6 +- src/SyncRes/SyncRes.csproj | 2 +- tools/ResourceUpdater/ResourceUpdater.vcxproj | 80 +++++++++ 7 files changed, 348 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a669b0ea5c..5d32818c69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,9 @@ if (MSVC) add_compile_options("/utf-8") add_compile_options("/MP") add_compile_options("/W4;/WX") - + add_compile_options("/wd4127") # conditional expression is constant + add_compile_options("/Wv:19.35.32217") # disable warning introduced after this version + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>DLL") else () add_compile_options("-Wall;-Werror;-Wextra;-Wpedantic;-Wno-missing-field-initializers") diff --git a/MAA.sln b/MAA.sln index d1d8be5eff..cfd06ea4a2 100644 --- a/MAA.sln +++ b/MAA.sln @@ -30,52 +30,52 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sample", "src\Cpp\MaaSample EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 + Debug|x64 = Debug|x64 Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 - RelWithDebInfo|ARM64 = RelWithDebInfo|ARM64 - RelWithDebInfo|x64 = RelWithDebInfo|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Debug|ARM64.Build.0 = Debug|ARM64 + {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Debug|x64.ActiveCfg = Debug|x64 + {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Debug|x64.Build.0 = Debug|x64 {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|ARM64.ActiveCfg = Release|ARM64 {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|ARM64.Build.0 = Release|ARM64 {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x64.ActiveCfg = Release|x64 {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x64.Build.0 = Release|x64 - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|ARM64 - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|ARM64 - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + {362D1E30-F5AE-4279-9985-65C27B3BA300}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {362D1E30-F5AE-4279-9985-65C27B3BA300}.Debug|ARM64.Build.0 = Debug|ARM64 + {362D1E30-F5AE-4279-9985-65C27B3BA300}.Debug|x64.ActiveCfg = Debug|x64 + {362D1E30-F5AE-4279-9985-65C27B3BA300}.Debug|x64.Build.0 = Debug|x64 {362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|ARM64.ActiveCfg = Release|ARM64 {362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|ARM64.Build.0 = Release|ARM64 {362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|x64.ActiveCfg = Release|x64 {362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|x64.Build.0 = Release|x64 - {362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|ARM64 - {362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|ARM64 - {362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 - {362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.Debug|ARM64.Build.0 = Debug|ARM64 + {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.Debug|x64.ActiveCfg = Debug|x64 + {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.Debug|x64.Build.0 = Debug|x64 {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.Release|ARM64.ActiveCfg = Release|ARM64 {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.Release|ARM64.Build.0 = Release|ARM64 {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.Release|x64.ActiveCfg = Release|x64 {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.Release|x64.Build.0 = Release|x64 - {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.RelWithDebInfo|ARM64.ActiveCfg = Release|ARM64 - {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.RelWithDebInfo|ARM64.Build.0 = Release|ARM64 - {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.RelWithDebInfo|x64.ActiveCfg = Release|x64 - {C9EA2837-0A4B-488F-A289-643B9D0BFCEB}.RelWithDebInfo|x64.Build.0 = Release|x64 + {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Debug|ARM64.Build.0 = Debug|ARM64 + {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Debug|x64.ActiveCfg = Debug|x64 + {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Debug|x64.Build.0 = Debug|x64 {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|ARM64.ActiveCfg = Release|ARM64 {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|ARM64.Build.0 = Release|ARM64 {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|x64.ActiveCfg = Release|x64 {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.Release|x64.Build.0 = Release|x64 - {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|ARM64 - {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|ARM64 - {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 - {F860C043-4D86-41B6-A97E-4A75C9A6C4EC}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Debug|ARM64.Build.0 = Debug|ARM64 + {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Debug|x64.ActiveCfg = Debug|x64 + {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Debug|x64.Build.0 = Debug|x64 {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|ARM64.ActiveCfg = Release|ARM64 {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|ARM64.Build.0 = Release|ARM64 {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x64.ActiveCfg = Release|x64 {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x64.Build.0 = Release|x64 - {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|ARM64.ActiveCfg = RelWithDebInfo|ARM64 - {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|ARM64.Build.0 = RelWithDebInfo|ARM64 - {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 - {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Cpp/MaaSample.vcxproj b/src/Cpp/MaaSample.vcxproj index 72cc05fad8..426401881e 100644 --- a/src/Cpp/MaaSample.vcxproj +++ b/src/Cpp/MaaSample.vcxproj @@ -1,6 +1,14 @@ + + Debug + ARM64 + + + Debug + x64 + Release ARM64 @@ -51,6 +59,13 @@ true Unicode + + Application + false + v143 + true + Unicode + Application false @@ -58,6 +73,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -72,9 +94,15 @@ + + + + + + false @@ -91,11 +119,21 @@ $(SolutionDir)\include $(TargetDir);$(LibraryPath) + + false + $(SolutionDir)\include + $(TargetDir);$(LibraryPath) + false $(SolutionDir)\include $(TargetDir);$(LibraryPath) + + false + $(SolutionDir)\include + $(TargetDir);$(LibraryPath) + Level4 @@ -166,6 +204,30 @@ true + + + Level3 + true + false + true + LOG_TRACE;NDEBUG;_CONSOLE;ASST_DEBUG;%(PreprocessorDefinitions) + true + stdcpp20 + stdc17 + MultiThreaded + Disabled + /utf-8 /MP %(AdditionalOptions) + + + Console + true + true + true + MaaCore.lib;%(AdditionalDependencies) + $(TargetDir);%(AdditionalLibraryDirectories) + true + + Level3 @@ -190,6 +252,30 @@ true + + + Level3 + true + false + true + LOG_TRACE;NDEBUG;_CONSOLE;ASST_DEBUG;%(PreprocessorDefinitions) + true + stdcpp20 + stdc17 + MultiThreaded + Disabled + /utf-8 /MP %(AdditionalOptions) + + + Console + true + true + true + MaaCore.lib;%(AdditionalDependencies) + $(TargetDir);%(AdditionalLibraryDirectories) + true + + diff --git a/src/MaaCore/MaaCore.vcxproj b/src/MaaCore/MaaCore.vcxproj index 66df8de952..e34219c7f7 100644 --- a/src/MaaCore/MaaCore.vcxproj +++ b/src/MaaCore/MaaCore.vcxproj @@ -1,6 +1,14 @@ + + Debug + ARM64 + + + Debug + x64 + Release ARM64 @@ -357,6 +365,13 @@ true Unicode + + DynamicLibrary + false + v143 + false + Unicode + DynamicLibrary false @@ -364,6 +379,13 @@ true Unicode + + DynamicLibrary + false + v143 + false + Unicode + @@ -378,9 +400,15 @@ + + + + + + false @@ -400,12 +428,24 @@ $(TargetDir);$(LibraryPath) $(ProjectDir)..\..\$(Platform)\$(Configuration)\ + + true + $(ProjectDir)..\..\include;$(ProjectDir)..\..\3rdparty\include;$(ProjectDir) + $(TargetDir);$(LibraryPath) + $(ProjectDir)..\..\$(Platform)\$(Configuration)\ + false $(ProjectDir)..\..\include;$(ProjectDir)..\..\3rdparty\include;$(ProjectDir) $(TargetDir);$(LibraryPath) $(ProjectDir)..\..\$(Platform)\$(Configuration)\ + + true + $(ProjectDir)..\..\include;$(ProjectDir)..\..\3rdparty\include;$(ProjectDir) + $(TargetDir);$(LibraryPath) + $(ProjectDir)..\..\$(Platform)\$(Configuration)\ + Level4 @@ -420,6 +460,7 @@ MaxSpeed /utf-8 /MP $(ExternalCompilerOptions) %(AdditionalOptions) true + 19.35.32217 Console @@ -466,6 +507,7 @@ MaxSpeed /utf-8 /MP $(ExternalCompilerOptions) %(AdditionalOptions) true + 19.35.32217 Console @@ -515,6 +557,7 @@ EnableFastChecks /utf-8 /MP $(ExternalCompilerOptions) %(AdditionalOptions) true + 19.35.32217 Console @@ -547,6 +590,60 @@ + + + Level4 + + + false + true + _CONSOLE;ASST_DLL_EXPORTS;ASST_DEBUG;%(PreprocessorDefinitions) + true + stdcpp20 + stdc11 + MultiThreadedDebugDLL + Disabled + false + EnableFastChecks + /utf-8 /MP $(ExternalCompilerOptions) %(AdditionalOptions) + true + EditAndContinue + 4127 + + + Console + + + + + true + MaaDerpLearning.lib;opencv_world4d.lib;zlibd.lib;ws2_32.lib;onnxruntime.lib;cpr.lib;libcurl-d.lib;crypt32.lib;%(AdditionalDependencies) + RequireAdministrator + + + /ignore:4286 %(AdditionalOptions) + + + + + + + + + + + + + + + + + + + + + + Level4 @@ -564,6 +661,7 @@ EnableFastChecks /utf-8 /MP $(ExternalCompilerOptions) %(AdditionalOptions) true + 19.35.32217 Console @@ -596,6 +694,60 @@ + + + Level4 + + + false + true + _CONSOLE;ASST_DLL_EXPORTS;ASST_DEBUG;%(PreprocessorDefinitions) + true + stdcpp20 + stdc11 + MultiThreadedDebugDLL + Disabled + false + EnableFastChecks + /utf-8 /MP $(ExternalCompilerOptions) %(AdditionalOptions) + true + EditAndContinue + 4127 + + + Console + + + + + true + MaaDerpLearning.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;onnxruntime.lib;cpr.lib;libcurl.lib;crypt32.lib;%(AdditionalDependencies) + RequireAdministrator + + + /ignore:4286 %(AdditionalOptions) + + + + + + + + + + + + + + + + + + + + + + @@ -604,4 +756,4 @@ - \ No newline at end of file + diff --git a/src/MaaWpfGui/MaaWpfGui.csproj b/src/MaaWpfGui/MaaWpfGui.csproj index 28b897dd45..db25f370a1 100644 --- a/src/MaaWpfGui/MaaWpfGui.csproj +++ b/src/MaaWpfGui/MaaWpfGui.csproj @@ -1,13 +1,12 @@ - True WinExe MaaWpfGui MAA net48 net481 x64;ARM64 - Release;RelWithDebInfo + Release;RelWithDebInfo;Debug https://github.com/MaaAssistantArknights/MaaAssistantArknights https://github.com/MaaAssistantArknights/MaaAssistantArknights/issues MAA @@ -54,7 +53,7 @@ 2.5.2 - + 5.7.0 All @@ -105,6 +104,7 @@ 1.3.6 + 7.0.2 diff --git a/src/SyncRes/SyncRes.csproj b/src/SyncRes/SyncRes.csproj index 6b12da6639..613fa3d224 100644 --- a/src/SyncRes/SyncRes.csproj +++ b/src/SyncRes/SyncRes.csproj @@ -1,6 +1,6 @@  - RelWithDebInfo;Release + RelWithDebInfo;Release;Debug x64;ARM64 netstandard2.0 false diff --git a/tools/ResourceUpdater/ResourceUpdater.vcxproj b/tools/ResourceUpdater/ResourceUpdater.vcxproj index 954caabbf3..55c01f44b4 100644 --- a/tools/ResourceUpdater/ResourceUpdater.vcxproj +++ b/tools/ResourceUpdater/ResourceUpdater.vcxproj @@ -1,6 +1,14 @@ + + Debug + ARM64 + + + Debug + x64 + Release ARM64 @@ -25,6 +33,13 @@ true Unicode + + Application + false + v143 + true + Unicode + Application false @@ -32,6 +47,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -40,20 +62,36 @@ + + + + + + false $(SolutionDir)MaaDeps\vcpkg\installed\maa-x64-windows\include;$(SolutionDir)3rdparty\include;$(VC_IncludePath);$(WindowsSDK_IncludePath) $(SolutionDir)MaaDeps\vcpkg\installed\maa-x64-windows\lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) + + false + $(SolutionDir)MaaDeps\vcpkg\installed\maa-x64-windows\include;$(SolutionDir)3rdparty\include;$(VC_IncludePath);$(WindowsSDK_IncludePath) + $(SolutionDir)MaaDeps\vcpkg\installed\maa-x64-windows\lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) + false $(SolutionDir)3rdparty\include;$(VC_IncludePath);$(WindowsSDK_IncludePath) $(SolutionDir)3rdparty\lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) + + false + $(SolutionDir)3rdparty\include;$(VC_IncludePath);$(WindowsSDK_IncludePath) + $(SolutionDir)3rdparty\lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) + Level4 @@ -75,6 +113,27 @@ opencv_world4.lib;%(AdditionalDependencies) + + + Level4 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp20 + /utf-8 /MP %(AdditionalOptions) + stdc17 + $(ProjectDir)..\..\src\MaaCore;%(AdditionalIncludeDirectories) + + + Console + true + true + true + opencv_world4.lib;%(AdditionalDependencies) + + Level4 @@ -96,6 +155,27 @@ opencv_world453.lib;%(AdditionalDependencies) + + + Level4 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp20 + /utf-8 /MP %(AdditionalOptions) + stdc17 + $(ProjectDir)..\..\src\MaaCore;%(AdditionalIncludeDirectories) + + + Console + true + true + true + opencv_world453.lib;%(AdditionalDependencies) + +