From 7218730e7cc0a0053c8218b64c58d1bf54217f36 Mon Sep 17 00:00:00 2001 From: lisyarus Date: Tue, 18 Jun 2024 12:35:22 +0300 Subject: [PATCH] Add wgpu to linux packaging --- package/linux/Dockerfile | 10 +++++++++- package/linux/toolchain.cmake | 8 +++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/package/linux/Dockerfile b/package/linux/Dockerfile index 1d11a09c..c5e080d7 100644 --- a/package/linux/Dockerfile +++ b/package/linux/Dockerfile @@ -54,6 +54,14 @@ RUN mv libpng.so `objdump -p libpng.so | grep SONAME | awk '{print $2}'` RUN cp `readlink -f /usr/lib/x86_64-linux-gnu/libmpg123.so` libmpg123.so RUN mv libmpg123.so `objdump -p libmpg123.so | grep SONAME | awk '{print $2}'` +# Install wgpu-native +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 +RUN mv wgpu-native/libwgpu_native.a wgpu-native/install + # Install toolchain file & main packaging script COPY toolchain.cmake . -COPY package.sh . +COPY package.sh . \ No newline at end of file diff --git a/package/linux/toolchain.cmake b/package/linux/toolchain.cmake index 43548287..2faa3d11 100644 --- a/package/linux/toolchain.cmake +++ b/package/linux/toolchain.cmake @@ -11,4 +11,10 @@ set(PSEMEK_PACKAGE_COPY_FILES ${PSEMEK_PACKAGE_ROOT}/sdl2/install/lib/libSDL2-2.0.so.0 ) -list(APPEND CMAKE_PREFIX_PATH "${PSEMEK_PACKAGE_ROOT}/sdl2/install") +list(APPEND CMAKE_PREFIX_PATH + "${PSEMEK_PACKAGE_ROOT}/sdl2/install" +) + +set(WGPU_NATIVE_ROOT + "${PSEMEK_PACKAGE_ROOT}/wgpu-native/install" +)