From efad11008616d30f685752fc70aa05be524c1a78 Mon Sep 17 00:00:00 2001 From: skal Date: Thu, 12 Mar 2026 17:14:57 +0100 Subject: fix(win): update wgpu-native to v27, unify Windows/macOS API paths MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - fetch_win_deps.sh: update wgpu-native v0.19.4.1 → v27.0.4.0 (same as macOS) - platform.h: remove v0.19 compat shims, Windows now uses WGPUStringView API - gpu.cc/gpu.h: remove DEMO_CROSS_COMPILE_WIN32 old-API branches - texture_readback.cc, visual_debug.cc, hybrid3d_effect.cc: same cleanup - rotating_cube_effect.cc: remove #ifdef guard for depthSlice - glfw3webgpu.c: remove old WGPUSurfaceDescriptorFromWindowsHWND branch - asset_manager.cc: fix DEMO_STRIP_ALL→STRIP_ALL guard (vs_main was missing in STRIP_ALL Windows builds because disk-loading path ran on embedded data) - tracker.cc: skip MP3 assets gracefully in STRIP_ALL builds instead of fatal handoff(Gemini): Windows .exe now runs under Wine. demo64k.exe renders frames and progresses through audio timeline. Pre-existing test failures unchanged. Co-Authored-By: Claude Sonnet 4.6 --- cmake/Toolchain-MinGW-w64.cmake | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'cmake/Toolchain-MinGW-w64.cmake') diff --git a/cmake/Toolchain-MinGW-w64.cmake b/cmake/Toolchain-MinGW-w64.cmake index 57c146a..910efb4 100644 --- a/cmake/Toolchain-MinGW-w64.cmake +++ b/cmake/Toolchain-MinGW-w64.cmake @@ -6,7 +6,11 @@ set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) set(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres) # Where is the target environment located -set(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32 /usr/local/opt/mingw-w64) +set(CMAKE_FIND_ROOT_PATH + /usr/x86_64-w64-mingw32 + /usr/local/opt/mingw-w64 + /opt/homebrew/Cellar/mingw-w64/13.0.0_2/toolchain-x86_64/x86_64-w64-mingw32 +) # Adjust the default behavior of the FIND_XXX() commands: # search for headers and libraries in the target environment, @@ -15,5 +19,9 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +# Statically link MinGW runtimes so the exe needs no libgcc/libstdc++/libwinpthread DLLs. +# wgpu_native.dll is still dynamic (linked via import lib). +set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -Wl,-Bstatic -lwinpthread -Wl,-Bdynamic") + # Define a flag to identify this specific build set(DEMO_CROSS_COMPILE_WIN32 ON) -- cgit v1.2.3