From bd202d08ae3cce3e05f3e23aac7884d146a7fbb0 Mon Sep 17 00:00:00 2001
From: lisyarus <lisyarus@gmail.com>
Date: Tue, 18 Jun 2024 12:35:39 +0300
Subject: [PATCH] Add wgpu to windows packaging

---
 cmake/modules/Findwgpu-native.cmake |  2 +-
 package/win/Dockerfile              | 17 +++++++++++++++++
 package/win/toolchain-host.cmake    |  4 ++++
 package/win/toolchain-target.cmake  |  5 +++++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/cmake/modules/Findwgpu-native.cmake b/cmake/modules/Findwgpu-native.cmake
index 3413aaff..517d3c06 100644
--- a/cmake/modules/Findwgpu-native.cmake
+++ b/cmake/modules/Findwgpu-native.cmake
@@ -3,7 +3,7 @@ if(wgpu-native_FOUND)
 endif()
 
 # Don't search for include files - these are bundled with psemek-wgpu lib
-find_library(wgpu-native_LIBRARIES NAMES libwgpu_native.a wgpu_native PATHS "${WGPU_NATIVE_ROOT}")
+find_library(wgpu-native_LIBRARIES NAMES libwgpu_native.a wgpu_native.dll wgpu_native PATHS "${WGPU_NATIVE_ROOT}")
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(wgpu-native DEFAULT_MSG wgpu-native_LIBRARIES)
diff --git a/package/win/Dockerfile b/package/win/Dockerfile
index c360c401..80ebd7c8 100644
--- a/package/win/Dockerfile
+++ b/package/win/Dockerfile
@@ -69,6 +69,23 @@ RUN mv blender-3.2.0-linux-x64 blender
 RUN rm blender-3.2.0-linux-x64.tar.xz
 RUN ln -sv /home/blender/blender /usr/local/bin/blender
 
+# Install wgpu-native for host
+RUN wget https://github.com/gfx-rs/wgpu-native/releases/download/v0.19.4.1/wgpu-linux-x86_64-release.zip
+RUN mkdir -p wgpu-native
+RUN unzip wgpu-*.zip -d wgpu-native
+RUN rm wgpu-*.zip
+RUN mkdir -p wgpu-native/install/host
+RUN mv wgpu-native/libwgpu_native.a wgpu-native/install/host
+
+# Install wgpu-native for target
+RUN wget https://github.com/gfx-rs/wgpu-native/releases/download/v0.19.4.1/wgpu-windows-x86_64-release.zip
+RUN mkdir -p wgpu-native
+RUN unzip -o wgpu-*.zip -d wgpu-native
+RUN rm wgpu-*.zip
+RUN chmod +x wgpu-native/wgpu_native.dll
+RUN mkdir -p wgpu-native/install/target
+RUN mv wgpu-native/wgpu_native.dll.lib wgpu-native/wgpu_native.dll wgpu-native/install/target
+
 # Install toolchain files & main packaging script
 COPY toolchain-host.cmake .
 COPY toolchain-target.cmake .
diff --git a/package/win/toolchain-host.cmake b/package/win/toolchain-host.cmake
index 012973f6..96a6a7b3 100644
--- a/package/win/toolchain-host.cmake
+++ b/package/win/toolchain-host.cmake
@@ -9,3 +9,7 @@ set(PSEMEK_PACKAGE_TARGET OFF)
 set(PSEMEK_PACKAGE_TOOLS_PATH "${PSEMEK_PACKAGE_ROOT}/tools")
 
 list(APPEND CMAKE_PREFIX_PATH "${PSEMEK_PACKAGE_ROOT}/sdl2/install")
+
+set(WGPU_NATIVE_ROOT
+	"${PSEMEK_PACKAGE_ROOT}/wgpu-native/install/host"
+)
diff --git a/package/win/toolchain-target.cmake b/package/win/toolchain-target.cmake
index 977a53f9..1c19ba6b 100644
--- a/package/win/toolchain-target.cmake
+++ b/package/win/toolchain-target.cmake
@@ -14,9 +14,14 @@ set(PSEMEK_PACKAGE_TOOLS_PATH "${PSEMEK_PACKAGE_ROOT}/tools")
 set(PSEMEK_PACKAGE_COPY_FILES
 	${PSEMEK_PACKAGE_ROOT}/sdl2/install/bin/SDL2.dll
 	/usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll
+	${PSEMEK_PACKAGE_ROOT}/wgpu-native/install/target/wgpu_native.dll
 )
 
 list(APPEND CMAKE_PREFIX_PATH
 	"${PSEMEK_PACKAGE_ROOT}/sdl2/install"
 	"${PSEMEK_PACKAGE_ROOT}/boost/install"
 )
+
+set(WGPU_NATIVE_ROOT
+	"${PSEMEK_PACKAGE_ROOT}/wgpu-native/install/target"
+)