chore: MaaControlUnit -> MaaAdbControlUnit

Author: MistEO

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

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)

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})

source/MaaControlUnit/ControlUnitMgr.cpp renamed to source/MaaAdbControlUnit/ControlUnitMgr.cpp

@@ -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)

source/MaaControlUnit/ControlUnitMgr.h renamed to source/MaaAdbControlUnit/ControlUnitMgr.h

@@ -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" />

source/MaaControlUnit/Directory.Build.props renamed to source/MaaAdbControlUnit/Directory.Build.props

@@ -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

source/MaaControlUnit/Directory.Build.targets renamed to source/MaaAdbControlUnit/Directory.Build.targets

@@ -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>