diff --git a/src/MeoAssistant/Controller.cpp b/src/MeoAssistant/Controller.cpp index 5c0fdf2005..675ef6a2e8 100644 --- a/src/MeoAssistant/Controller.cpp +++ b/src/MeoAssistant/Controller.cpp @@ -1,9 +1,9 @@ #include "Controller.h" #include "Utils/AsstConf.h" -#include "Utils/AsstPlatform.h" +#include "Utils/Platform/AsstPlatform.h" #ifdef _WIN32 -#include "Utils/AsstPlatformWin32.h" +#include "Utils/Platform/AsstPlatformWin32.h" #include #else #include diff --git a/src/MeoAssistant/Controller.h b/src/MeoAssistant/Controller.h index fc13011158..19bc5a9590 100644 --- a/src/MeoAssistant/Controller.h +++ b/src/MeoAssistant/Controller.h @@ -1,7 +1,7 @@ #pragma once #ifdef _WIN32 -#include "Utils/SafeWindows.h" +#include "Utils/Platform/SafeWindows.h" #include #endif diff --git a/src/MeoAssistant/MeoAssistant.vcxproj b/src/MeoAssistant/MeoAssistant.vcxproj index 139fecab11..e3d9812963 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj +++ b/src/MeoAssistant/MeoAssistant.vcxproj @@ -118,9 +118,9 @@ - - - + + + @@ -129,7 +129,7 @@ - + @@ -224,8 +224,8 @@ - - + + 16.0 @@ -384,4 +384,4 @@ - \ No newline at end of file + diff --git a/src/MeoAssistant/MeoAssistant.vcxproj.filters b/src/MeoAssistant/MeoAssistant.vcxproj.filters index 2fdf0aa5aa..57bf3a90db 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj.filters +++ b/src/MeoAssistant/MeoAssistant.vcxproj.filters @@ -298,10 +298,10 @@ 源文件\Task - + 源文件\Utils - + 源文件\Utils @@ -608,7 +608,7 @@ 源文件\Task - + 源文件\Utils @@ -641,13 +641,13 @@ 源文件\Utils - + 源文件\Utils - + 源文件\Utils - + 源文件\Utils @@ -684,4 +684,4 @@ 源文件\Utils - \ No newline at end of file + diff --git a/src/MeoAssistant/Resource/OcrPack.cpp b/src/MeoAssistant/Resource/OcrPack.cpp index 92819767a7..83b79c518c 100644 --- a/src/MeoAssistant/Resource/OcrPack.cpp +++ b/src/MeoAssistant/Resource/OcrPack.cpp @@ -9,8 +9,8 @@ #include "Utils/Logger.hpp" #ifdef _WIN32 -#include "Utils/AsstPlatformWin32.h" -#include "Utils/SafeWindows.h" +#include "Utils/Platform/AsstPlatformWin32.h" +#include "Utils/Platform/SafeWindows.h" #include static std::filesystem::path prepare_paddle_dir(const std::filesystem::path& dir, bool* is_temp); #else diff --git a/src/MeoAssistant/Utils/AsstUtils.hpp b/src/MeoAssistant/Utils/AsstUtils.hpp index a30e5a50df..321174f07b 100644 --- a/src/MeoAssistant/Utils/AsstUtils.hpp +++ b/src/MeoAssistant/Utils/AsstUtils.hpp @@ -9,7 +9,7 @@ #include #ifdef _WIN32 -#include "SafeWindows.h" +#include "Platform/SafeWindows.h" #else #include #include diff --git a/src/MeoAssistant/Utils/AsstPlatform.h b/src/MeoAssistant/Utils/Platform/AsstPlatform.h similarity index 100% rename from src/MeoAssistant/Utils/AsstPlatform.h rename to src/MeoAssistant/Utils/Platform/AsstPlatform.h diff --git a/src/MeoAssistant/Utils/AsstPlatformPosix.cpp b/src/MeoAssistant/Utils/Platform/AsstPlatformPosix.cpp similarity index 98% rename from src/MeoAssistant/Utils/AsstPlatformPosix.cpp rename to src/MeoAssistant/Utils/Platform/AsstPlatformPosix.cpp index 96ef7b9b8e..06e331129e 100644 --- a/src/MeoAssistant/Utils/AsstPlatformPosix.cpp +++ b/src/MeoAssistant/Utils/Platform/AsstPlatformPosix.cpp @@ -1,7 +1,7 @@ #if __has_include() #include "AsstPlatformPosix.h" #include "AsstPlatform.h" -#include "AsstUtils.hpp" +#include "Utils/AsstUtils.hpp" #include diff --git a/src/MeoAssistant/Utils/AsstPlatformPosix.h b/src/MeoAssistant/Utils/Platform/AsstPlatformPosix.h similarity index 100% rename from src/MeoAssistant/Utils/AsstPlatformPosix.h rename to src/MeoAssistant/Utils/Platform/AsstPlatformPosix.h diff --git a/src/MeoAssistant/Utils/AsstPlatformWin32.cpp b/src/MeoAssistant/Utils/Platform/AsstPlatformWin32.cpp similarity index 99% rename from src/MeoAssistant/Utils/AsstPlatformWin32.cpp rename to src/MeoAssistant/Utils/Platform/AsstPlatformWin32.cpp index aea21cef68..f287cba480 100644 --- a/src/MeoAssistant/Utils/AsstPlatformWin32.cpp +++ b/src/MeoAssistant/Utils/Platform/AsstPlatformWin32.cpp @@ -6,8 +6,8 @@ #include #include -#include "AsstUtils.hpp" -#include "Logger.hpp" +#include "Utils/AsstUtils.hpp" +#include "Utils/Logger.hpp" static size_t get_page_size() { diff --git a/src/MeoAssistant/Utils/AsstPlatformWin32.h b/src/MeoAssistant/Utils/Platform/AsstPlatformWin32.h similarity index 100% rename from src/MeoAssistant/Utils/AsstPlatformWin32.h rename to src/MeoAssistant/Utils/Platform/AsstPlatformWin32.h diff --git a/src/MeoAssistant/Utils/SafeWindows.h b/src/MeoAssistant/Utils/Platform/SafeWindows.h similarity index 100% rename from src/MeoAssistant/Utils/SafeWindows.h rename to src/MeoAssistant/Utils/Platform/SafeWindows.h