Update Static Libs for AOT

+ Pack the libraries and extract it only if AOT compilation is used + Ensure to use Link Target Optimization (LTO) on linker + (Hopefully) Fix some missing symbols at MachineIndependent.lib
CollapseLauncher · Jan 21, 2025 · 8156a2c · 8156a2c
1 parent 574669c
commit 8156a2c
Show file tree

Hide file tree

Showing 22 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,8 @@
 packages/*
 
 CollapseLauncher/Deps/*
+CollapseLauncher/StaticLib/*.lib
+CollapseLauncher/StaticLib/**/*.lib
 CollapseLauncher/Invoker/*
 **/Generated Files/**
 *.psd

diff --git a/CollapseLauncher/CollapseLauncher.csproj b/CollapseLauncher/CollapseLauncher.csproj
@@ -121,6 +121,7 @@
         <NativeLibrary Include="StaticLib\Waifu2x\ncnn.lib" />
         <NativeLibrary Include="StaticLib\Waifu2x\SPIRV.lib" />
         <NativeLibrary Include="StaticLib\Waifu2x\glslang.lib" />
+        <NativeLibrary Include="StaticLib\Waifu2x\glslang-default-resource-limits.lib" />
         <NativeLibrary Include="StaticLib\Waifu2x\OGLCompiler.lib" />
         <NativeLibrary Include="StaticLib\Waifu2x\MachineIndependent.lib" />
         <NativeLibrary Include="StaticLib\Waifu2x\GenericCodeGen.lib" />
@@ -347,6 +348,10 @@
         <RemoveDir Directories="$(OutDir)Lib\win-x86" Condition="Exists('$(OutDir)Lib\win-x86')" />
     </Target>
 
+    <Target Name="PreBuild-NativeAOTStaticLib" BeforeTargets="PreBuildEvent" Condition="'$(PublishAot)' == 'true'">
+        <Exec Command="&quot;$(ProjectDir)StaticLib\7za.exe&quot; x &quot;$(ProjectDir)StaticLib\StaticLib.7z&quot; -o&quot;$(ProjectDir)StaticLib\&quot; -y" />
+    </Target>
+
     <Target Name="PostBuild" AfterTargets="Publish">
         <Exec Command="del /s /q $(PublishDir)av*-58.dll $(PublishDir)av*-60.dll $(PublishDir)avfilter-9.dll $(PublishDir)av*.lib&#xD;&#xA;rd /s /q $(PublishDir)Lib\win-arm64 &amp; exit 0" Condition="$(DefineConstants.Contains('USEFFMPEGFORVIDEOBG'))" />
         <Exec Command="copy /Y $(ProjectDir)$(OutDir)Lib\win-x64\Hi3Helper.TaskScheduler.exe $(PublishDir)Lib\win-x64\" />
@@ -385,7 +390,7 @@
     </Target>
 
 	<ItemGroup Condition="'$(PublishAot)' == 'true'">
-		<LinkerArg Include="/DEBUG:NONE /NODEFAULTLIB:MSVCRT" />
+		<LinkerArg Include="/DEBUG:NONE /NODEFAULTLIB:MSVCRT /LTCG" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/CollapseLauncher/StaticLib/7za.exe b/CollapseLauncher/StaticLib/7za.exe
diff --git a/CollapseLauncher/StaticLib/StaticLib.7z b/CollapseLauncher/StaticLib/StaticLib.7z
diff --git a/CollapseLauncher/StaticLib/Waifu2x/GenericCodeGen.lib b/CollapseLauncher/StaticLib/Waifu2x/GenericCodeGen.lib
diff --git a/CollapseLauncher/StaticLib/Waifu2x/MachineIndependent.lib b/CollapseLauncher/StaticLib/Waifu2x/MachineIndependent.lib
diff --git a/CollapseLauncher/StaticLib/Waifu2x/OGLCompiler.lib b/CollapseLauncher/StaticLib/Waifu2x/OGLCompiler.lib
diff --git a/CollapseLauncher/StaticLib/Waifu2x/OSDependent.lib b/CollapseLauncher/StaticLib/Waifu2x/OSDependent.lib
diff --git a/CollapseLauncher/StaticLib/Waifu2x/SPIRV.lib b/CollapseLauncher/StaticLib/Waifu2x/SPIRV.lib
diff --git a/CollapseLauncher/StaticLib/Waifu2x/glslang.lib b/CollapseLauncher/StaticLib/Waifu2x/glslang.lib
diff --git a/CollapseLauncher/StaticLib/Waifu2x/ncnn.lib b/CollapseLauncher/StaticLib/Waifu2x/ncnn.lib
diff --git a/CollapseLauncher/StaticLib/WindowsKits/10.0.22621.0_um_x64/UserEnv.Lib b/CollapseLauncher/StaticLib/WindowsKits/10.0.22621.0_um_x64/UserEnv.Lib
diff --git a/CollapseLauncher/StaticLib/WindowsKits/10.0.22621.0_um_x64/shell32.lib b/CollapseLauncher/StaticLib/WindowsKits/10.0.22621.0_um_x64/shell32.lib
diff --git a/CollapseLauncher/StaticLib/csharp_bindings_msvc-release.lib b/CollapseLauncher/StaticLib/csharp_bindings_msvc-release.lib
diff --git a/CollapseLauncher/StaticLib/libomp_msvc-release.lib b/CollapseLauncher/StaticLib/libomp_msvc-release.lib
diff --git a/CollapseLauncher/StaticLib/libsharpyuv_msvc-release.lib b/CollapseLauncher/StaticLib/libsharpyuv_msvc-release.lib
diff --git a/CollapseLauncher/StaticLib/libwebp_msvc-release.lib b/CollapseLauncher/StaticLib/libwebp_msvc-release.lib
diff --git a/CollapseLauncher/StaticLib/libwebpdecoder_msvc-release.lib b/CollapseLauncher/StaticLib/libwebpdecoder_msvc-release.lib
diff --git a/CollapseLauncher/StaticLib/libwebpdemux_msvc-release.lib b/CollapseLauncher/StaticLib/libwebpdemux_msvc-release.lib
diff --git a/CollapseLauncher/StaticLib/libwebpmux_msvc-release.lib b/CollapseLauncher/StaticLib/libwebpmux_msvc-release.lib
diff --git a/CollapseLauncher/StaticLib/waifu2x-ncnn-vulkan_msvc-release.lib b/CollapseLauncher/StaticLib/waifu2x-ncnn-vulkan_msvc-release.lib
diff --git a/ColorThief b/ColorThief