From 4d8d40ca8991195d3bd77506c0c0dbfa798f2ce9 Mon Sep 17 00:00:00 2001 From: dantmnf Date: Fri, 13 Jan 2023 01:06:50 +0800 Subject: [PATCH] feat: Add ARM64 target --- MAA.sln | 26 +++- src/Cpp/Sample.vcxproj | 85 ++++++++++ src/MaaCore/MaaCore.vcxproj | 145 +++++++++++++++++- src/MaaWpfGui/MaaWpfGui.csproj | 5 +- src/SyncRes/SyncRes.csproj | 24 +-- tools/ResourceUpdater/ResourceUpdater.vcxproj | 42 ++++- 6 files changed, 297 insertions(+), 30 deletions(-) diff --git a/MAA.sln b/MAA.sln index 8d63c45c25..20a6d9b9a0 100644 --- a/MAA.sln +++ b/MAA.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 17.2.32616.157 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{6C4B8D52-51D1-45F8-AAEC-808035443FD6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MaaWpfGui", "src\MaaWpfGui\MaaWpfGui.csproj", "{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MaaWpfGui", "src\MaaWpfGui\MaaWpfGui.csproj", "{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}" ProjectSection(ProjectDependencies) = postProject {362D1E30-F5AE-4279-9985-65C27B3BA300} = {362D1E30-F5AE-4279-9985-65C27B3BA300} {F860C043-4D86-41B6-A97E-4A75C9A6C4EC} = {F860C043-4D86-41B6-A97E-4A75C9A6C4EC} @@ -20,7 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ResourceUpdater", "tools\ResourceUpdater\ResourceUpdater.vcxproj", "{C9EA2837-0A4B-488F-A289-643B9D0BFCEB}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SyncRes", "src\SyncRes\SyncRes.vcxproj", "{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SyncRes", "src\SyncRes\SyncRes.csproj", "{F860C043-4D86-41B6-A97E-4A75C9A6C4EC}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sample", "src\Cpp\Sample.vcxproj", "{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}" ProjectSection(ProjectDependencies) = postProject @@ -30,28 +30,50 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sample", "src\Cpp\Sample.vc EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + 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}.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}.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}.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}.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}.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 diff --git a/src/Cpp/Sample.vcxproj b/src/Cpp/Sample.vcxproj index 05276fb0c7..2e98b3e312 100644 --- a/src/Cpp/Sample.vcxproj +++ b/src/Cpp/Sample.vcxproj @@ -1,10 +1,18 @@ + + Release + ARM64 + Release x64 + + RelWithDebInfo + ARM64 + RelWithDebInfo x64 @@ -29,6 +37,13 @@ true Unicode + + Application + false + v143 + true + Unicode + Application false @@ -36,6 +51,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -44,20 +66,36 @@ + + + + + + false $(SolutionDir)\include $(TargetDir);$(LibraryPath) + + false + $(SolutionDir)\include + $(TargetDir);$(LibraryPath) + false $(SolutionDir)\include $(TargetDir);$(LibraryPath) + + false + $(SolutionDir)\include + $(TargetDir);$(LibraryPath) + Level4 @@ -81,6 +119,29 @@ true + + + Level4 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp20 + stdc17 + MultiThreaded + /utf-8 /MP %(AdditionalOptions) + + + Console + true + true + true + MaaCore.lib;%(AdditionalDependencies) + $(TargetDir);%(AdditionalLibraryDirectories) + true + + Level3 @@ -105,6 +166,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 763116e97b..9a803c8a64 100644 --- a/src/MaaCore/MaaCore.vcxproj +++ b/src/MaaCore/MaaCore.vcxproj @@ -1,10 +1,18 @@ + + Release + ARM64 + Release x64 + + RelWithDebInfo + ARM64 + RelWithDebInfo x64 @@ -283,6 +291,13 @@ true Unicode + + DynamicLibrary + false + v143 + true + Unicode + DynamicLibrary false @@ -290,6 +305,13 @@ true Unicode + + DynamicLibrary + false + v143 + true + Unicode + @@ -298,9 +320,15 @@ + + + + + + false @@ -308,12 +336,24 @@ $(TargetDir);$(ProjectDir)..\..\3rdparty\lib;$(LibraryPath) $(ProjectDir)..\..\$(Platform)\$(Configuration)\ + + false + $(ProjectDir)..\..\include;$(ProjectDir)..\..\3rdparty\include;$(ProjectDir) + $(TargetDir);$(LibraryPath) + $(ProjectDir)..\..\$(Platform)\$(Configuration)\ + false $(ProjectDir)..\..\include;$(ProjectDir)..\..\3rdparty\include;$(ProjectDir); $(TargetDir);$(ProjectDir)..\..\3rdparty\lib;$(LibraryPath) $(ProjectDir)..\..\$(Platform)\$(Configuration)\ + + false + $(ProjectDir)..\..\include;$(ProjectDir)..\..\3rdparty\include;$(ProjectDir) + $(TargetDir);$(LibraryPath) + $(ProjectDir)..\..\$(Platform)\$(Configuration)\ + Level4 @@ -334,10 +374,55 @@ true true true - fastdeploy.lib;opencv_world453.lib;zlibstatic.lib;ws2_32.lib;adb-lite.lib;%(AdditionalDependencies) + adb-lite.lib;fastdeploy.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies) + RequireAdministrator + true + msvcrt.lib + /ignore:4286 %(AdditionalOptions) + + + + + + + + + + + + + + + + + + + + + + + + + Level4 + true + true + true + NDEBUG;_CONSOLE;ASST_DLL_EXPORTS;%(PreprocessorDefinitions) + true + stdcpp20 + stdc11 + MultiThreaded + MaxSpeed + /utf-8 /MP $(ExternalCompilerOptions) %(AdditionalOptions) + true + + + Console + true + true + true + adb-lite.lib;fastdeploy.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies) RequireAdministrator - - true msvcrt.lib /ignore:4286 %(AdditionalOptions) @@ -386,10 +471,58 @@ true true true - fastdeploy.lib;opencv_world453.lib;zlibstatic.lib;ws2_32.lib;adb-lite.lib;%(AdditionalDependencies) + adb-lite.lib;fastdeploy.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies) + RequireAdministrator + true + msvcrt.lib + /ignore:4286 %(AdditionalOptions) + + + + + + + + + + + + + + + + + + + + + + + + + Level4 + + + false + true + NDEBUG;_CONSOLE;ASST_DLL_EXPORTS;ASST_DEBUG;%(PreprocessorDefinitions) + true + stdcpp20 + stdc11 + MultiThreaded + Disabled + true + EnableFastChecks + /utf-8 /MP $(ExternalCompilerOptions) %(AdditionalOptions) + true + + + Console + true + true + true + adb-lite.lib;fastdeploy.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies) RequireAdministrator - - true msvcrt.lib /ignore:4286 %(AdditionalOptions) diff --git a/src/MaaWpfGui/MaaWpfGui.csproj b/src/MaaWpfGui/MaaWpfGui.csproj index d1ac78a2e3..b4aab08f24 100644 --- a/src/MaaWpfGui/MaaWpfGui.csproj +++ b/src/MaaWpfGui/MaaWpfGui.csproj @@ -4,8 +4,9 @@ MaaWpfGui MAA net48 - x64 - Debug;Release;RelWithDebInfo + net481 + x64;ARM64 + Release;RelWithDebInfo https://github.com/MistEO/MaaCoreArknights https://github.com/MistEO/MaaCoreArknights/issues Meo明日方舟辅助 diff --git a/src/SyncRes/SyncRes.csproj b/src/SyncRes/SyncRes.csproj index 308739103f..19429d9fc1 100644 --- a/src/SyncRes/SyncRes.csproj +++ b/src/SyncRes/SyncRes.csproj @@ -1,6 +1,6 @@  - Debug;RelWithDebInfo;Release + RelWithDebInfo;Release x64;ARM64 netstandard2.0 false @@ -17,23 +17,9 @@ - - - - + + + + diff --git a/tools/ResourceUpdater/ResourceUpdater.vcxproj b/tools/ResourceUpdater/ResourceUpdater.vcxproj index 26df76c58e..804e0dc8e4 100644 --- a/tools/ResourceUpdater/ResourceUpdater.vcxproj +++ b/tools/ResourceUpdater/ResourceUpdater.vcxproj @@ -1,6 +1,10 @@ + + Release + ARM64 + Release x64 @@ -21,6 +25,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -29,12 +40,20 @@ + + + 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 @@ -56,10 +75,31 @@ 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) + + - + \ No newline at end of file