chore: MaaControlUnit -> MaaAdbControlUnit

MaaXYZ · Oct 19, 2023 · 0ffedaf · 0ffedaf
1 parent 0fdf1f5
commit 0ffedaf
Show file tree

Hide file tree

Showing 56 changed files with 35 additions and 35 deletions.
diff --git a/MAA.sln b/MAA.sln
@@ -19,7 +19,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaaFramework", "source\MaaF
 		{DD48546D-48D4-4C84-BAC4-6126D0B5BFB3} = {DD48546D-48D4-4C84-BAC4-6126D0B5BFB3}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaaControlUnit", "source\MaaControlUnit\MaaControlUnit.vcxproj", "{DD48546D-48D4-4C84-BAC4-6126D0B5BFB3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MaaAdbControlUnit", "source\MaaAdbControlUnit\MaaAdbControlUnit.vcxproj", "{DD48546D-48D4-4C84-BAC4-6126D0B5BFB3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{27862F0F-109D-40C8-B48B-9461D15222E3} = {27862F0F-109D-40C8-B48B-9461D15222E3}
 	EndProjectSection

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -1,5 +1,5 @@
 add_subdirectory(MaaUtils)
-add_subdirectory(MaaControlUnit)
+add_subdirectory(MaaAdbControlUnit)
 if(WITH_THRIFT AND NOT MAA_CROSSCOMPILE)
     add_subdirectory(MaaThriftController)
 endif(WITH_THRIFT AND NOT MAA_CROSSCOMPILE)

diff --git a/source/MaaAdbControlUnit/CMakeLists.txt b/source/MaaAdbControlUnit/CMakeLists.txt
@@ -0,0 +1,23 @@
+file(GLOB_RECURSE maa_control_unit_src *.h *.hpp *.cpp ../include)
+
+add_library(MaaAdbControlUnit SHARED ${maa_control_unit_src})
+
+target_include_directories(MaaAdbControlUnit PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../include
+                                                  ${CMAKE_CURRENT_SOURCE_DIR}/../../include)
+
+target_link_libraries(MaaAdbControlUnit MaaUtils HeaderOnlyLibraries ${OpenCV_LIBS} ZLIB::ZLIB Boost::system)
+if(WIN32)
+    target_link_libraries(MaaAdbControlUnit ws2_32)
+endif()
+
+target_compile_definitions(MaaAdbControlUnit PRIVATE MAA_CONTROL_UNIT_EXPORTS)
+
+add_dependencies(MaaAdbControlUnit MaaUtils)
+
+install(
+    TARGETS MaaAdbControlUnit
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION bin
+    ARCHIVE DESTINATION lib)
+
+source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${maa_control_unit_src})
diff --git a/source/MaaControlUnit/ControlUnitMgr.cpp → source/MaaAdbControlUnit/ControlUnitMgr.cpp b/source/MaaControlUnit/ControlUnitMgr.cpp → source/MaaAdbControlUnit/ControlUnitMgr.cpp
diff --git a/source/MaaControlUnit/ControlUnitMgr.h → source/MaaAdbControlUnit/ControlUnitMgr.h b/source/MaaControlUnit/ControlUnitMgr.h → source/MaaAdbControlUnit/ControlUnitMgr.h
diff --git a/source/MaaControlUnit/Directory.Build.props → ...e/MaaAdbControlUnit/Directory.Build.props b/source/MaaControlUnit/Directory.Build.props → ...e/MaaAdbControlUnit/Directory.Build.props
diff --git a/...ce/MaaControlUnit/Directory.Build.targets → ...MaaAdbControlUnit/Directory.Build.targets b/...ce/MaaControlUnit/Directory.Build.targets → ...MaaAdbControlUnit/Directory.Build.targets
diff --git a/source/MaaControlUnit/General/Activity.cpp → ...ce/MaaAdbControlUnit/General/Activity.cpp b/source/MaaControlUnit/General/Activity.cpp → ...ce/MaaAdbControlUnit/General/Activity.cpp
diff --git a/source/MaaControlUnit/General/Activity.h → source/MaaAdbControlUnit/General/Activity.h b/source/MaaControlUnit/General/Activity.h → source/MaaAdbControlUnit/General/Activity.h
diff --git a/source/MaaControlUnit/General/Connection.cpp → .../MaaAdbControlUnit/General/Connection.cpp b/source/MaaControlUnit/General/Connection.cpp → .../MaaAdbControlUnit/General/Connection.cpp
diff --git a/source/MaaControlUnit/General/Connection.h → ...ce/MaaAdbControlUnit/General/Connection.h b/source/MaaControlUnit/General/Connection.h → ...ce/MaaAdbControlUnit/General/Connection.h
diff --git a/source/MaaControlUnit/General/DeviceInfo.cpp → .../MaaAdbControlUnit/General/DeviceInfo.cpp b/source/MaaControlUnit/General/DeviceInfo.cpp → .../MaaAdbControlUnit/General/DeviceInfo.cpp
diff --git a/source/MaaControlUnit/General/DeviceInfo.h → ...ce/MaaAdbControlUnit/General/DeviceInfo.h b/source/MaaControlUnit/General/DeviceInfo.h → ...ce/MaaAdbControlUnit/General/DeviceInfo.h
diff --git a/source/MaaControlUnit/General/DeviceList.cpp → .../MaaAdbControlUnit/General/DeviceList.cpp b/source/MaaControlUnit/General/DeviceList.cpp → .../MaaAdbControlUnit/General/DeviceList.cpp
diff --git a/source/MaaControlUnit/General/DeviceList.h → ...ce/MaaAdbControlUnit/General/DeviceList.h b/source/MaaControlUnit/General/DeviceList.h → ...ce/MaaAdbControlUnit/General/DeviceList.h
diff --git a/...ce/MaaControlUnit/Input/MaatouchInput.cpp → ...MaaAdbControlUnit/Input/MaatouchInput.cpp b/...ce/MaaControlUnit/Input/MaatouchInput.cpp → ...MaaAdbControlUnit/Input/MaatouchInput.cpp
diff --git a/source/MaaControlUnit/Input/MaatouchInput.h → ...e/MaaAdbControlUnit/Input/MaatouchInput.h b/source/MaaControlUnit/Input/MaatouchInput.h → ...e/MaaAdbControlUnit/Input/MaatouchInput.h
diff --git a/...e/MaaControlUnit/Input/MinitouchInput.cpp → ...aaAdbControlUnit/Input/MinitouchInput.cpp b/...e/MaaControlUnit/Input/MinitouchInput.cpp → ...aaAdbControlUnit/Input/MinitouchInput.cpp
diff --git a/source/MaaControlUnit/Input/MinitouchInput.h → .../MaaAdbControlUnit/Input/MinitouchInput.h b/source/MaaControlUnit/Input/MinitouchInput.h → .../MaaAdbControlUnit/Input/MinitouchInput.h
diff --git a/source/MaaControlUnit/Input/MtouchHelper.cpp → .../MaaAdbControlUnit/Input/MtouchHelper.cpp b/source/MaaControlUnit/Input/MtouchHelper.cpp → .../MaaAdbControlUnit/Input/MtouchHelper.cpp
diff --git a/source/MaaControlUnit/Input/MtouchHelper.h → ...ce/MaaAdbControlUnit/Input/MtouchHelper.h b/source/MaaControlUnit/Input/MtouchHelper.h → ...ce/MaaAdbControlUnit/Input/MtouchHelper.h
diff --git a/source/MaaControlUnit/Input/TapInput.cpp → source/MaaAdbControlUnit/Input/TapInput.cpp b/source/MaaControlUnit/Input/TapInput.cpp → source/MaaAdbControlUnit/Input/TapInput.cpp
diff --git a/source/MaaControlUnit/Input/TapInput.h → source/MaaAdbControlUnit/Input/TapInput.h b/source/MaaControlUnit/Input/TapInput.h → source/MaaAdbControlUnit/Input/TapInput.h
diff --git a/source/MaaControlUnit/Invoke/InvokeApp.cpp → ...ce/MaaAdbControlUnit/Invoke/InvokeApp.cpp b/source/MaaControlUnit/Invoke/InvokeApp.cpp → ...ce/MaaAdbControlUnit/Invoke/InvokeApp.cpp
diff --git a/source/MaaControlUnit/Invoke/InvokeApp.h → source/MaaAdbControlUnit/Invoke/InvokeApp.h b/source/MaaControlUnit/Invoke/InvokeApp.h → source/MaaAdbControlUnit/Invoke/InvokeApp.h
diff --git a/source/MaaControlUnit/MaaControlUnit.vcxproj → ...aAdbControlUnit/MaaAdbControlUnit.vcxproj b/source/MaaControlUnit/MaaControlUnit.vcxproj → ...aAdbControlUnit/MaaAdbControlUnit.vcxproj
diff --git a/source/MaaControlUnit/Platform/BoostIO.cpp → ...ce/MaaAdbControlUnit/Platform/BoostIO.cpp b/source/MaaControlUnit/Platform/BoostIO.cpp → ...ce/MaaAdbControlUnit/Platform/BoostIO.cpp
diff --git a/source/MaaControlUnit/Platform/BoostIO.h → source/MaaAdbControlUnit/Platform/BoostIO.h b/source/MaaControlUnit/Platform/BoostIO.h → source/MaaAdbControlUnit/Platform/BoostIO.h
diff --git a/...MaaControlUnit/Platform/PlatformFactory.h → ...AdbControlUnit/Platform/PlatformFactory.h b/...MaaControlUnit/Platform/PlatformFactory.h → ...AdbControlUnit/Platform/PlatformFactory.h
diff --git a/source/MaaControlUnit/Platform/PlatformIO.h → ...e/MaaAdbControlUnit/Platform/PlatformIO.h b/source/MaaControlUnit/Platform/PlatformIO.h → ...e/MaaAdbControlUnit/Platform/PlatformIO.h
diff --git a/source/MaaControlUnit/Screencap/Encode.cpp → ...ce/MaaAdbControlUnit/Screencap/Encode.cpp b/source/MaaControlUnit/Screencap/Encode.cpp → ...ce/MaaAdbControlUnit/Screencap/Encode.cpp
diff --git a/source/MaaControlUnit/Screencap/Encode.h → source/MaaAdbControlUnit/Screencap/Encode.h b/source/MaaControlUnit/Screencap/Encode.h → source/MaaAdbControlUnit/Screencap/Encode.h
diff --git a/...MaaControlUnit/Screencap/EncodeToFile.cpp → ...AdbControlUnit/Screencap/EncodeToFile.cpp b/...MaaControlUnit/Screencap/EncodeToFile.cpp → ...AdbControlUnit/Screencap/EncodeToFile.cpp
diff --git a/...e/MaaControlUnit/Screencap/EncodeToFile.h → ...aaAdbControlUnit/Screencap/EncodeToFile.h b/...e/MaaControlUnit/Screencap/EncodeToFile.h → ...aaAdbControlUnit/Screencap/EncodeToFile.h
diff --git a/...e/MaaControlUnit/Screencap/FastestWay.cpp → ...aaAdbControlUnit/Screencap/FastestWay.cpp b/...e/MaaControlUnit/Screencap/FastestWay.cpp → ...aaAdbControlUnit/Screencap/FastestWay.cpp
diff --git a/source/MaaControlUnit/Screencap/FastestWay.h → .../MaaAdbControlUnit/Screencap/FastestWay.h b/source/MaaControlUnit/Screencap/FastestWay.h → .../MaaAdbControlUnit/Screencap/FastestWay.h
diff --git a/...rolUnit/Screencap/Minicap/MinicapBase.cpp → ...rolUnit/Screencap/Minicap/MinicapBase.cpp b/...rolUnit/Screencap/Minicap/MinicapBase.cpp → ...rolUnit/Screencap/Minicap/MinicapBase.cpp
diff --git a/...ntrolUnit/Screencap/Minicap/MinicapBase.h → ...ntrolUnit/Screencap/Minicap/MinicapBase.h b/...ntrolUnit/Screencap/Minicap/MinicapBase.h → ...ntrolUnit/Screencap/Minicap/MinicapBase.h
diff --git a/...ontrolUnit/Screencap/Minicap/MinicapDef.h → ...ontrolUnit/Screencap/Minicap/MinicapDef.h b/...ontrolUnit/Screencap/Minicap/MinicapDef.h → ...ontrolUnit/Screencap/Minicap/MinicapDef.h
diff --git a/...lUnit/Screencap/Minicap/MinicapDirect.cpp → ...lUnit/Screencap/Minicap/MinicapDirect.cpp b/...lUnit/Screencap/Minicap/MinicapDirect.cpp → ...lUnit/Screencap/Minicap/MinicapDirect.cpp
diff --git a/...rolUnit/Screencap/Minicap/MinicapDirect.h → ...rolUnit/Screencap/Minicap/MinicapDirect.h b/...rolUnit/Screencap/Minicap/MinicapDirect.h → ...rolUnit/Screencap/Minicap/MinicapDirect.h
diff --git a/...lUnit/Screencap/Minicap/MinicapStream.cpp → ...lUnit/Screencap/Minicap/MinicapStream.cpp b/...lUnit/Screencap/Minicap/MinicapStream.cpp → ...lUnit/Screencap/Minicap/MinicapStream.cpp
diff --git a/...rolUnit/Screencap/Minicap/MinicapStream.h → ...rolUnit/Screencap/Minicap/MinicapStream.h b/...rolUnit/Screencap/Minicap/MinicapStream.h → ...rolUnit/Screencap/Minicap/MinicapStream.h
diff --git a/.../MaaControlUnit/Screencap/RawByNetcat.cpp → ...aAdbControlUnit/Screencap/RawByNetcat.cpp b/.../MaaControlUnit/Screencap/RawByNetcat.cpp → ...aAdbControlUnit/Screencap/RawByNetcat.cpp
diff --git a/...ce/MaaControlUnit/Screencap/RawByNetcat.h → ...MaaAdbControlUnit/Screencap/RawByNetcat.h b/...ce/MaaControlUnit/Screencap/RawByNetcat.h → ...MaaAdbControlUnit/Screencap/RawByNetcat.h
diff --git a/.../MaaControlUnit/Screencap/RawWithGzip.cpp → ...aAdbControlUnit/Screencap/RawWithGzip.cpp b/.../MaaControlUnit/Screencap/RawWithGzip.cpp → ...aAdbControlUnit/Screencap/RawWithGzip.cpp
diff --git a/...ce/MaaControlUnit/Screencap/RawWithGzip.h → ...MaaAdbControlUnit/Screencap/RawWithGzip.h b/...ce/MaaControlUnit/Screencap/RawWithGzip.h → ...MaaAdbControlUnit/Screencap/RawWithGzip.h
diff --git a/...ControlUnit/Screencap/ScreencapHelper.cpp → ...ControlUnit/Screencap/ScreencapHelper.cpp b/...ControlUnit/Screencap/ScreencapHelper.cpp → ...ControlUnit/Screencap/ScreencapHelper.cpp
diff --git a/...aaControlUnit/Screencap/ScreencapHelper.h → ...dbControlUnit/Screencap/ScreencapHelper.h b/...aaControlUnit/Screencap/ScreencapHelper.h → ...dbControlUnit/Screencap/ScreencapHelper.h
diff --git a/source/MaaControlUnit/UnitBase.cpp → source/MaaAdbControlUnit/UnitBase.cpp b/source/MaaControlUnit/UnitBase.cpp → source/MaaAdbControlUnit/UnitBase.cpp
diff --git a/source/MaaControlUnit/UnitBase.h → source/MaaAdbControlUnit/UnitBase.h b/source/MaaControlUnit/UnitBase.h → source/MaaAdbControlUnit/UnitBase.h
diff --git a/source/MaaControlUnit/CMakeLists.txt b/source/MaaControlUnit/CMakeLists.txt
diff --git a/source/MaaFramework/CMakeLists.txt b/source/MaaFramework/CMakeLists.txt
@@ -18,7 +18,7 @@ target_include_directories(
 
 target_compile_definitions(MaaFramework PRIVATE MAA_FRAMEWORK_EXPORTS)
 
-target_link_libraries(MaaFramework MaaControlUnit MaaUtils)
+target_link_libraries(MaaFramework MaaAdbControlUnit MaaUtils)
 if(WITH_THRIFT AND NOT MAA_CROSSCOMPILE)
     target_link_libraries(MaaFramework MaaThriftController)
 endif(WITH_THRIFT AND NOT MAA_CROSSCOMPILE)
@@ -27,7 +27,7 @@ target_link_libraries(MaaFramework ${OpenCV_LIBS} fastdeploy_ppocr ONNXRuntime::
 # clang 15之后有ranges if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") find_package(range-v3 REQUIRED)
 # target_link_libraries(MaaFramework range-v3::range-v3) endif ()
 
-add_dependencies(MaaFramework MaaControlUnit MaaUtils)
+add_dependencies(MaaFramework MaaAdbControlUnit MaaUtils)
 if(WITH_THRIFT AND NOT MAA_CROSSCOMPILE)
     add_dependencies(MaaFramework MaaThriftController)
 endif(WITH_THRIFT AND NOT MAA_CROSSCOMPILE)

diff --git a/source/MaaFramework/MaaFramework.vcxproj b/source/MaaFramework/MaaFramework.vcxproj
@@ -202,7 +202,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>MaaUtils.lib;MaaControlUnit.lib;fastdeploy_ppocr.lib;onnxruntime.lib;opencv_world4.lib;thriftmd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MaaUtils.lib;MaaAdbControlUnit.lib;fastdeploy_ppocr.lib;onnxruntime.lib;opencv_world4.lib;thriftmd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <Profile>true</Profile>
       <AdditionalOptions>/ignore:4286 %(AdditionalOptions)</AdditionalOptions>
     </Link>
@@ -232,7 +232,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>MaaUtils.lib;MaaControlUnit.lib;fastdeploy_ppocr.lib;onnxruntime.lib;opencv_world4.lib;thriftmd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MaaUtils.lib;MaaAdbControlUnit.lib;fastdeploy_ppocr.lib;onnxruntime.lib;opencv_world4.lib;thriftmd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <Profile>true</Profile>
     </Link>
   </ItemDefinitionGroup>
@@ -257,7 +257,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>MaaUtils.lib;MaaControlUnit.lib;fastdeploy_ppocr.lib;onnxruntime.lib;opencv_world4d.lib;thriftmdd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MaaUtils.lib;MaaAdbControlUnit.lib;fastdeploy_ppocr.lib;onnxruntime.lib;opencv_world4d.lib;thriftmdd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/source/MaaToolKit/CMakeLists.txt b/source/MaaToolKit/CMakeLists.txt
@@ -18,9 +18,9 @@ target_include_directories(
 
 target_compile_definitions(MaaToolKit PRIVATE MAA_TOOLKIT_EXPORTS)
 
-target_link_libraries(MaaToolKit MaaFramework MaaUtils MaaControlUnit HeaderOnlyLibraries Boost::system)
+target_link_libraries(MaaToolKit MaaFramework MaaUtils MaaAdbControlUnit HeaderOnlyLibraries Boost::system)
 
-add_dependencies(MaaToolKit MaaFramework MaaUtils MaaControlUnit)
+add_dependencies(MaaToolKit MaaFramework MaaUtils MaaAdbControlUnit)
 
 install(
     TARGETS MaaToolKit

diff --git a/source/MaaToolKit/MaaToolKit.vcxproj b/source/MaaToolKit/MaaToolKit.vcxproj
@@ -121,7 +121,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>MaaControlUnit.lib;MaaUtils.lib;MaaFramework.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MaaAdbControlUnit.lib;MaaUtils.lib;MaaFramework.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
       <Profile>true</Profile>
       <AdditionalOptions>/ignore:4286 %(AdditionalOptions)</AdditionalOptions>
@@ -149,7 +149,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>MaaControlUnit.lib;MaaUtils.lib;MaaFramework.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MaaAdbControlUnit.lib;MaaUtils.lib;MaaFramework.lib;opencv_world4.lib;zlib.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
       <Profile>true</Profile>
     </Link>
@@ -175,7 +175,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>MaaControlUnit.lib;MaaUtils.lib;MaaFramework.lib;opencv_world4d.lib;zlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>MaaAdbControlUnit.lib;MaaUtils.lib;MaaFramework.lib;opencv_world4d.lib;zlibd.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <UACExecutionLevel>RequireAdministrator</UACExecutionLevel>
     </Link>
   </ItemDefinitionGroup>