fix

MaaXYZ · Mar 27, 2024 · f3d92d0 · f3d92d0
1 parent 4dde63e
commit f3d92d0
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 12 deletions.
diff --git a/source/LibraryHolder/CMakeLists.txt b/source/LibraryHolder/CMakeLists.txt
@@ -7,7 +7,7 @@ set_target_properties(LibraryHolder PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_include_directories(LibraryHolder
     PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MAA_PRIVATE_INC} ${MAA_PUBLIC_INC})
 
-target_link_libraries(LibraryHolder MaaUtils HeaderOnlyLibraries Boost::system)
+target_link_libraries(LibraryHolder MaaUtils HeaderOnlyLibraries Boost::system ${OpenCV_LIBS})
 
 add_dependencies(LibraryHolder MaaUtils)
 

diff --git a/source/LibraryHolder/ControlUnit/ControlUnit.cpp b/source/LibraryHolder/ControlUnit/ControlUnit.cpp
@@ -23,8 +23,8 @@ bool check_version(const std::string& func_name)
     LogInfo << typeid(ControlUnitT).name() << "Library version:" << version;
 
     if (std::strcmp(version, MAA_VERSION) != 0) {
-        LogWarn << "ControlUnit and MaaFramework are not same version,"
-                << "ControlUnit:" << version << "MaaFramework:" << MAA_VERSION;
+        LogWarn << "ControlUnit and MaaFramework are not same version," << "ControlUnit:" << version
+                << "MaaFramework:" << MAA_VERSION;
     }
     return true;
 }
@@ -219,4 +219,4 @@ std::shared_ptr<MAA_CTRL_UNIT_NS::ControlUnitAPI>
         destroy_control_unit);
 }
 
-MAA_NS_END
+MAA_NS_END
diff --git a/source/MaaFramework/Instance/InstanceStatus.cpp b/source/MaaFramework/Instance/InstanceStatus.cpp
@@ -1,6 +1,7 @@
 #include "InstanceStatus.h"
 
 #include "Utils/Logger.h"
+#include "Utils/NoWarningCV.hpp"
 
 MAA_NS_BEGIN
 
@@ -128,4 +129,4 @@ bool InstanceStatus::cv_mat_equal(const cv::Mat& lhs, const cv::Mat& rhs)
     return eq2;
 }
 
-MAA_NS_END
+MAA_NS_END
diff --git a/source/MaaFramework/Resource/PipelineResMgr.cpp b/source/MaaFramework/Resource/PipelineResMgr.cpp
@@ -2,6 +2,7 @@
 
 #include "Utils/Codec.h"
 #include "Utils/Logger.h"
+#include "Utils/Platform.h"
 #include "Utils/StringMisc.hpp"
 #include "Vision/VisionTypes.h"
 
@@ -1417,4 +1418,4 @@ bool PipelineResMgr::parse_action_target(
     return true;
 }
 
-MAA_RES_NS_END
+MAA_RES_NS_END
diff --git a/source/MaaProjectInterface/CLI/main.cpp b/source/MaaProjectInterface/CLI/main.cpp
@@ -3,6 +3,7 @@
 
 #include "MaaToolkit/MaaToolkitAPI.h"
 #include "Utils/Runtime.h"
+#include "Utils/Platform.h"
 
 #include "interactor.h"
 

diff --git a/source/MaaToolkit/API/MaaToolkitConfig.cpp b/source/MaaToolkit/API/MaaToolkitConfig.cpp
@@ -5,6 +5,7 @@
 #include "Config/GlobalOptionConfig.h"
 #include "Utils/Logger.h"
 #include "Utils/Runtime.h"
+#include "Utils/Platform.h"
 
 MaaBool MaaToolkitInitOptionConfig(MaaStringView user_path, MaaStringView default_json)
 {

diff --git a/source/MaaToolkit/API/MaaToolkitExecAgent.cpp b/source/MaaToolkit/API/MaaToolkitExecAgent.cpp
@@ -7,6 +7,7 @@
 #include "ExecAgent/ActionExecAgent.h"
 #include "ExecAgent/RecognizerExecAgent.h"
 #include "Utils/Logger.h"
+#include "Utils/Platform.h"
 
 using namespace MAA_TOOLKIT_NS;
 
@@ -136,4 +137,4 @@ MaaBool
     MaaToolkitUnregisterCustomActionExecutor(MaaInstanceHandle handle, MaaStringView action_name)
 {
     return UnregisterExecutor(ExecutorType::Action, handle, action_name);
-}
+}
diff --git a/source/MaaToolkit/AdbDevice/DeviceMgr.cpp b/source/MaaToolkit/AdbDevice/DeviceMgr.cpp
@@ -2,6 +2,7 @@
 
 #include <future>
 
+#include "ControlUnit/ControlUnitAPI.h"
 #include "LibraryHolder/ControlUnit.h"
 #include "Utils/Logger.h"
 
@@ -168,4 +169,4 @@ MaaAdbControllerType DeviceMgr::check_adb_controller_type(
     return kInputType | kScreencapType;
 }
 
-MAA_TOOLKIT_NS_END
+MAA_TOOLKIT_NS_END
diff --git a/source/MaaToolkit/ExecAgent/ExecAgentBase.h b/source/MaaToolkit/ExecAgent/ExecAgentBase.h
@@ -6,6 +6,7 @@
 #include <mutex>
 #include <string_view>
 #include <thread>
+#include <filesystem>
 
 #include <meojson/json.hpp>
 

diff --git a/source/include/LibraryHolder/ControlUnit.h b/source/include/LibraryHolder/ControlUnit.h
@@ -1,12 +1,14 @@
 #pragma once
 
-#include "LibraryHolder.h"
-
 #include <memory>
 
-#include "ControlUnit/ControlUnitAPI.h"
+#include "LibraryHolder.h"
 #include "Utils/Platform.h"
 
+MAA_CTRL_UNIT_NS_BEGIN
+class ControlUnitAPI;
+MAA_CTRL_UNIT_NS_END
+
 MAA_NS_BEGIN
 
 class AdbControlUnitLibraryHolder : public LibraryHolder<AdbControlUnitLibraryHolder>

diff --git a/source/include/ProjectInterface/Types.h b/source/include/ProjectInterface/Types.h
@@ -4,9 +4,10 @@
 #include <unordered_map>
 #include <vector>
 
+#include <meojson/json.hpp>
+
 #include "Conf/Conf.h"
 #include "MaaFramework/MaaDef.h"
-#include "Utils/JsonExt.hpp"
 
 MAA_PROJECT_INTERFACE_NS_BEGIN