chore: 依赖 dll 移到 third_party 文件夹

Blinue · Mar 10, 2024 · 06ca4e0 · 06ca4e0
1 parent a6cc7fa
commit 06ca4e0
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 15 deletions.
diff --git a/src/Common.Post.props b/src/Common.Post.props
@@ -48,15 +48,25 @@
     </Link>
   </ItemDefinitionGroup>
 
-	<!--TensorRT -->
-	<ItemDefinitionGroup>
-		<ClCompile>
-			<AdditionalIncludeDirectories>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.2\include;S:\TensorRT-8.6.1.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-		</ClCompile>
-		<Link>
-			<AdditionalLibraryDirectories>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.2\lib\x64;S:\TensorRT-8.6.1.6\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-		</Link>
-	</ItemDefinitionGroup>
+  <!--TensorRT -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+        <AdditionalIncludeDirectories>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.2\include;S:\TensorRT-8.6.1.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+        <AdditionalLibraryDirectories>C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v12.2\lib\x64;S:\TensorRT-8.6.1.6\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <Target Name="FixDllPath" BeforeTargets="PrepareForBuild">
+    <ItemGroup>
+      <DirectMLContent Include="@(Content)" Condition="'%(Filename)' == '$(Microsoft_AI_DirectML_Library_Basename)' or '%(Filename)' == '$(Microsoft_AI_DirectML_Debug_Layer_Basename)'" />
+      <Content Remove="@(DirectMLContent)" />
+      <Content Include="@(DirectMLContent)">
+        <TargetPath>third_party\%(FileName)%(Extension)</TargetPath>
+      </Content>
+    </ItemGroup>
+  </Target>
 
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
     <ClCompile>

diff --git a/src/Magpie.App/Magpie.App.vcxproj b/src/Magpie.App/Magpie.App.vcxproj
@@ -62,6 +62,7 @@
       <SubSystem>Console</SubSystem>
       <AdditionalDependencies>kernel32.lib;ole32.lib;oleaut32.lib;user32.lib;gdi32.lib;$(OutDir).\Magpie.Core.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>Magpie.App.def</ModuleDefinitionFile>
+      <DelayLoadDLLs>d3d12.dll;cudart64_12.dll;onnxruntime.dll;DirectML.dll</DelayLoadDLLs>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/src/Magpie/main.cpp b/src/Magpie/main.cpp
@@ -19,19 +19,22 @@
 #include "StrUtils.h"
 
 // 将当前目录设为程序所在目录
-static void SetCurDir() noexcept {
-	wchar_t curDir[MAX_PATH] = { 0 };
-	GetModuleFileName(NULL, curDir, MAX_PATH);
+static std::wstring SetCurDir() noexcept {
+	std::wstring curDir(MAX_PATH, L'\0');
+	curDir.resize(GetModuleFileName(NULL, curDir.data(), MAX_PATH));
 
-	for (int i = (int)StrUtils::StrLen(curDir) - 1; i >= 0; --i) {
+	int i = (int)curDir.size() - 1;
+	for (; i >= 0; --i) {
 		if (curDir[i] == L'\\' || curDir[i] == L'/') {
 			break;
 		} else {
 			curDir[i] = L'\0';
 		}
 	}
+	curDir.resize(i);
 
-	SetCurrentDirectory(curDir);
+	SetCurrentDirectory(curDir.c_str());
+	return curDir;
 }
 
 int APIENTRY wWinMain(
@@ -51,7 +54,11 @@ int APIENTRY wWinMain(
 	// 见 https://kennykerr.ca/2018/03/24/cppwinrt-hosting-the-windows-runtime/
 	winrt::init_apartment(winrt::apartment_type::single_threaded);
 
-	SetCurDir();
+	std::wstring curDir = SetCurDir();
+
+	SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
+	curDir += L"\\third_party";
+	AddDllDirectory(curDir.c_str());
 
 	auto& app = Magpie::XamlApp::Get();
 	if (!app.Initialize(hInstance, lpCmdLine)) {