From bfb5a11012ee5190f7d5bc46b8afbcb29942795d Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Fri, 19 Apr 2024 11:17:44 -0400 Subject: [PATCH 1/2] Update quickjs-wz --- 3rdparty/quickjs-wz | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/quickjs-wz b/3rdparty/quickjs-wz index d95a193a065..27ed115de5e 160000 --- a/3rdparty/quickjs-wz +++ b/3rdparty/quickjs-wz @@ -1 +1 @@ -Subproject commit d95a193a065f40f1c35da04fb57ca96627ff9d23 +Subproject commit 27ed115de5ed39a502b4449b8f2ea5dc7cf93f5f From a572cf23170c41a86c82dc8be5b309f1c598330f Mon Sep 17 00:00:00 2001 From: past-due <30942300+past-due@users.noreply.github.com> Date: Fri, 19 Apr 2024 12:06:47 -0400 Subject: [PATCH 2/2] [CMake] Emscripten: Fix copying static assets to build dir --- src/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d1de68ac201..ec270f45e73 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -839,8 +839,9 @@ else() COMPONENT Core DESTINATION "${WZ_APP_INSTALL_DEST}/assets") # Also place assets in build dir so it can be run directly + file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/assets") foreach(asset IN LISTS static_assets) - configure_file("${asset}" "${CMAKE_CURRENT_BINARY_DIR}/" COPYONLY) + configure_file("${asset}" "${CMAKE_CURRENT_BINARY_DIR}/assets/" COPYONLY) endforeach() endif()