merge upstream

fix: shaders not building
chore: add x64 lib
2026-08-15 22:58:27 +00:00 · 2026-08-15 18:56:00 -04:00 · 2026-08-09 00:14:35 -04:00
6 changed files with 4 additions and 5 deletions
@@ -1,4 +1,4 @@
-x64/
+4J_*/x64/
 Debug/
 ipch/

@@ -160,10 +160,6 @@
      <SubSystem>Windows</SubSystem>
      <GenerateDebugInformation>true</GenerateDebugInformation>
    </Link>
-    <PreLinkEvent>
-      <Command>
-      </Command>
-    </PreLinkEvent>
    <PreBuildEvent>
      <Command>./Windows64/shaders/build.bat</Command>
    </PreBuildEvent>
@@ -208,6 +204,9 @@
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <OptimizeReferences>true</OptimizeReferences>
    </Link>
+    <PreBuildEvent>
+      <Command>./Windows64/shaders/build.bat</Command>
+    </PreBuildEvent>
  </ItemDefinitionGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
Author	SHA1	Message	Date
str1k3r	0c24c663ef	merge upstream	2026-08-15 22:58:27 +00:00
str1k3r	842fb91443	fix: shaders not building	2026-08-15 18:56:00 -04:00
str1k3r	f549c757b9	chore: add x64 lib	2026-08-09 00:14:35 -04:00