子项目不再共享 Conan 依赖

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
       uses: actions/cache@v3
       with:
         path: ./.conan/data
-        key: ${{ runner.os }}-conan-${{ hashFiles('src/conanfile.txt') }}
+        key: ${{ runner.os }}-conan-${{ hashFiles('src/**/conanfile.txt') }}
 
     - name: Restore NuGet packages
       run: nuget restore

Magpie.sln

@@ -18,7 +18,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{00AB63C3-0CD3-4944-B8E6-58C86138618D}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
-		src\conanfile.py = src\conanfile.py
 		Directory.Build.props = Directory.Build.props
 		src\Solution.props = src\Solution.props
 	EndProjectSection

src/CONAN_INSTALL/ConanInstall.bat

@@ -9,14 +9,22 @@ conan config set storage.path=%CD%\..\..\.conan\data
 
 IF %1 == Debug (
 	IF %2 == x64 (
-		conan install ..\conanfile.py --install-folder ..\..\.conan\x64\Debug --build=outdated -s build_type=Debug -s arch=x86_64 -s compiler.version=17 -s compiler.runtime=MTd --update
+		conan install ..\Magpie\conanfile.txt --install-folder ..\..\.conan\x64\Debug\Magpie --build=outdated -s build_type=Debug -s arch=x86_64 -s compiler.version=17 -s compiler.runtime=MTd --update
+		conan install ..\Magpie.Core\conanfile.txt --install-folder ..\..\.conan\x64\Debug\Magpie.Core --build=outdated -s build_type=Debug -s arch=x86_64 -s compiler.version=17 -s compiler.runtime=MTd --update
+		conan install ..\Magpie.App\conanfile.txt --install-folder ..\..\.conan\x64\Debug\Magpie.App --build=outdated -s build_type=Debug -s arch=x86_64 -s compiler.version=17 -s compiler.runtime=MTd --update
 	) ELSE (
-		conan install ..\conanfile.py --install-folder ..\..\.conan\ARM64\Debug --build=outdated -s build_type=Debug -s arch=armv8 -s compiler.version=17 -s compiler.runtime=MTd --update
+		conan install ..\Magpie\conanfile.txt --install-folder ..\..\.conan\ARM64\Debug\Magpie --build=outdated -s build_type=Debug -s arch=armv8 -s compiler.version=17 -s compiler.runtime=MTd --update
+		conan install ..\Magpie.Core\conanfile.txt --install-folder ..\..\.conan\ARM64\Debug\Magpie.Core --build=outdated -s build_type=Debug -s arch=armv8 -s compiler.version=17 -s compiler.runtime=MTd --update
+		conan install ..\Magpie.App\conanfile.txt --install-folder ..\..\.conan\ARM64\Debug\Magpie.App --build=outdated -s build_type=Debug -s arch=armv8 -s compiler.version=17 -s compiler.runtime=MTd --update
 	)
 ) ELSE (
 	IF %2 == x64 (
-		conan install ..\conanfile.py --install-folder ..\..\.conan\x64\Release --build=outdated -s build_type=Release -s arch=x86_64 -s compiler.version=17 -s compiler.runtime=MT --update
+		conan install ..\Magpie\conanfile.txt --install-folder ..\..\.conan\x64\Release\Magpie --build=outdated -s build_type=Release -s arch=x86_64 -s compiler.version=17 -s compiler.runtime=MT --update
+		conan install ..\Magpie.Core\conanfile.txt --install-folder ..\..\.conan\x64\Release\Magpie.Core --build=outdated -s build_type=Release -s arch=x86_64 -s compiler.version=17 -s compiler.runtime=MT --update
+		conan install ..\Magpie.App\conanfile.txt --install-folder ..\..\.conan\x64\Release\Magpie.App --build=outdated -s build_type=Release -s arch=x86_64 -s compiler.version=17 -s compiler.runtime=MT --update
 	) ELSE (
-		conan install ..\conanfile.py --install-folder ..\..\.conan\ARM64\Release --build=outdated -s build_type=Release -s arch=armv8 -s compiler.version=17 -s compiler.runtime=MT --update
+		conan install ..\Magpie\conanfile.txt --install-folder ..\..\.conan\ARM64\Release\Magpie --build=outdated -s build_type=Release -s arch=armv8 -s compiler.version=17 -s compiler.runtime=MT --update
+		conan install ..\Magpie.Core\conanfile.txt --install-folder ..\..\.conan\ARM64\Release\Magpie.Core --build=outdated -s build_type=Release -s arch=armv8 -s compiler.version=17 -s compiler.runtime=MT --update
+		conan install ..\Magpie.App\conanfile.txt --install-folder ..\..\.conan\ARM64\Release\Magpie.App --build=outdated -s build_type=Release -s arch=armv8 -s compiler.version=17 -s compiler.runtime=MT --update
 	)
 )

src/Magpie.App/Magpie.App.vcxproj

@@ -554,6 +554,11 @@
     <PRIResource Include="Resources.language-zh-Hans.resw" />
     <PRIResource Include="Resources.language-zh-Hant.resw" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="conanfile.txt">
+      <DeploymentContent>false</DeploymentContent>
+    </Text>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\packages\Microsoft.UI.Xaml.2.8.2-prerelease.220830001\build\native\Microsoft.UI.Xaml.targets')" />

src/Magpie.App/Magpie.App.vcxproj.filters

@@ -283,4 +283,7 @@
       <Filter>Strings</Filter>
     </PRIResource>
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="conanfile.txt" />
+  </ItemGroup>
 </Project>

src/Magpie.App/conanfile.txt

@@ -0,0 +1,14 @@
+[requires]
+fmt/9.1.0
+spdlog/1.11.0
+parallel-hashmap/1.37
+rapidjson/cci.20220822
+kuba-zip/0.2.6
+
+[generators]
+visual_studio
+
+[options]
+fmt:header_only=True
+spdlog:header_only=True
+spdlog:no_exceptions=True

src/Magpie.Core/EffectCacheManager.cpp

@@ -5,6 +5,7 @@
 #include "Logger.h"
 #include "CommonSharedConstants.h"
 #include <d3dcompiler.h>
+#include <zstd.h>
 #include "Utils.h"
 
 // YAS 暂不支持 ARM64
@@ -121,6 +122,37 @@ void serialize(Archive& ar, EffectDesc& o) {
 	ar& o.name& o.outSizeExpr& o.params& o.textures& o.samplers& o.passes& o.flags;
 }
 
+static bool ZstdCompress(std::span<const BYTE> src, std::vector<BYTE>& dest, int compressionLevel) noexcept {
+	dest.resize(ZSTD_compressBound(src.size()));
+	size_t size = ZSTD_compress(dest.data(), dest.size(), src.data(), src.size(), compressionLevel);
+
+	if (ZSTD_isError(size)) {
+		Logger::Get().Error(StrUtils::Concat("压缩失败：", ZSTD_getErrorName(size)));
+		return false;
+	}
+
+	dest.resize(size);
+	return true;
+}
+
+static bool ZstdDecompress(std::span<const BYTE> src, std::vector<BYTE>& dest) noexcept {
+	auto size = ZSTD_getFrameContentSize(src.data(), src.size());
+	if (size == ZSTD_CONTENTSIZE_UNKNOWN || size == ZSTD_CONTENTSIZE_ERROR) {
+		Logger::Get().Error("ZSTD_getFrameContentSize 失败");
+		return false;
+	}
+
+	dest.resize(size);
+	size = ZSTD_decompress(dest.data(), dest.size(), src.data(), src.size());
+	if (ZSTD_isError(size)) {
+		Logger::Get().Error(StrUtils::Concat("解压失败：", ZSTD_getErrorName(size)));
+		return false;
+	}
+
+	dest.resize(size);
+
+	return true;
+}
 
 static constexpr const uint32_t MAX_CACHE_COUNT = 127;
 
@@ -209,7 +241,7 @@ bool EffectCacheManager::Load(std::wstring_view effectName, std::wstring_view ha
 			return false;
 		}
 
-		if (!Utils::ZstdDecompress(compressedBuf, buf)) {
+		if (!ZstdDecompress(compressedBuf, buf)) {
 			Logger::Get().Error("解压缓存失败");
 			return false;
 		}
@@ -251,7 +283,7 @@ void EffectCacheManager::Save(std::wstring_view effectName, std::wstring_view ha
 		}
 
 
-		if (!Utils::ZstdCompress(buf, compressedBuf, CACHE_COMPRESSION_LEVEL)) {
+		if (!ZstdCompress(buf, compressedBuf, CACHE_COMPRESSION_LEVEL)) {
 			Logger::Get().Error("压缩缓存失败");
 			return;
 		}

src/Magpie.Core/Magpie.Core.vcxproj

@@ -145,6 +145,11 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="conanfile.txt">
+      <DeploymentContent>false</DeploymentContent>
+    </Text>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.230225.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.230225.1\build\native\Microsoft.Windows.CppWinRT.targets')" />

src/Magpie.Core/Magpie.Core.vcxproj.filters

@@ -145,4 +145,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="conanfile.txt" />
+  </ItemGroup>
 </Project>

src/Magpie.Core/conanfile.txt

@@ -0,0 +1,19 @@
+[requires]
+fmt/9.1.0
+spdlog/1.11.0
+parallel-hashmap/1.37
+muparser/2.3.4
+yas/7.1.0
+zstd/1.5.5
+imgui/1.89.4
+
+[generators]
+visual_studio
+
+[options]
+fmt:header_only=True
+spdlog:header_only=True
+spdlog:no_exceptions=True
+
+[imports]
+./res/bindings, imgui_impl_dx11.* -> ../../../../src/Magpie.Core

src/Magpie/Magpie.vcxproj

@@ -121,6 +121,11 @@
   <ItemGroup>
     <Image Include="Magpie.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="conanfile.txt">
+      <DeploymentContent>false</DeploymentContent>
+    </Text>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Import Project="XamlIslands.targets" />
   <ImportGroup Label="ExtensionTargets">

src/Magpie/conanfile.txt

@@ -0,0 +1,12 @@
+[requires]
+fmt/9.1.0
+spdlog/1.11.0
+parallel-hashmap/1.37
+
+[generators]
+visual_studio
+
+[options]
+fmt:header_only=True
+spdlog:header_only=True
+spdlog:no_exceptions=True

src/Shared/Utils.cpp

@@ -2,40 +2,6 @@
 #include "Utils.h"
 #include "Logger.h"
 #include "StrUtils.h"
-#include <zstd.h>
-
-
-bool Utils::ZstdCompress(std::span<const BYTE> src, std::vector<BYTE>& dest, int compressionLevel) {
-	dest.resize(ZSTD_compressBound(src.size()));
-	size_t size = ZSTD_compress(dest.data(), dest.size(), src.data(), src.size(), compressionLevel);
-
-	if (ZSTD_isError(size)) {
-		Logger::Get().Error(StrUtils::Concat("压缩失败：", ZSTD_getErrorName(size)));
-		return false;
-	}
-
-	dest.resize(size);
-	return true;
-}
-
-bool Utils::ZstdDecompress(std::span<const BYTE> src, std::vector<BYTE>& dest) {
-	auto size = ZSTD_getFrameContentSize(src.data(), src.size());
-	if (size == ZSTD_CONTENTSIZE_UNKNOWN || size == ZSTD_CONTENTSIZE_ERROR) {
-		Logger::Get().Error("ZSTD_getFrameContentSize 失败");
-		return false;
-	}
-
-	dest.resize(size);
-	size = ZSTD_decompress(dest.data(), dest.size(), src.data(), src.size());
-	if (ZSTD_isError(size)) {
-		Logger::Get().Error(StrUtils::Concat("解压失败：", ZSTD_getErrorName(size)));
-		return false;
-	}
-
-	dest.resize(size);
-
-	return true;
-}
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //

src/Shared/Utils.h

@@ -26,8 +26,5 @@ struct Utils {
 		T _exitScope;
 	};
 
-	static bool ZstdCompress(std::span<const BYTE> src, std::vector<BYTE>& dest, int compressionLevel);
-	static bool ZstdDecompress(std::span<const BYTE> src, std::vector<BYTE>& dest);
-
 	static uint64_t HashData(std::span<const BYTE> data) noexcept;
 };

src/Solution.props

@@ -34,6 +34,6 @@
 
   <!-- Conan 依赖 -->
   <ImportGroup Label="PropertySheets">
-    <Import Project="..\.conan\$(Platform)\$(Configuration)\conanbuildinfo.props" Condition="exists('..\.conan\$(Platform)\$(Configuration)\conanbuildinfo.props')" />
+    <Import Project="..\.conan\$(Platform)\$(Configuration)\$(MSBuildProjectName)\conanbuildinfo.props" Condition="exists('..\.conan\$(Platform)\$(Configuration)\$(MSBuildProjectName)\conanbuildinfo.props')" />
   </ImportGroup>
 </Project>