Skip to content

Commit ce2abde

Browse files
committed
WASM builds now load all files normally
1 parent 810b9ae commit ce2abde

File tree

2 files changed

+15
-28
lines changed

2 files changed

+15
-28
lines changed

Framework/cmake/CompileProject.cmake

-24
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,6 @@ endif()
1919
multicast(set_target_properties PROPERTIES LINKER_LANGUAGE CXX)
2020
include(SetupTargetSettings)
2121

22-
if (EMSCRIPTEN)
23-
multicast(target_compile_options PRIVATE -fwasm-exceptions -sSUPPORT_LONGJMP=wasm)
24-
25-
# Package asset files
26-
file(GLOB_RECURSE CONFIG_ASSET_FILES ${CMAKE_SOURCE_DIR}/Config/*)
27-
file(GLOB_RECURSE CONTENT_ASSET_FILES ${CMAKE_SOURCE_DIR}/Content/*)
28-
29-
foreach(asset_file ${CONFIG_ASSET_FILES})
30-
string(REPLACE "${CMAKE_SOURCE_DIR}/" "" relative_asset_file ${asset_file})
31-
list(APPEND ASSET_LINK_FLAGS --preload-file ${asset_file}@/${relative_asset_file})
32-
endforeach()
33-
34-
foreach(asset_file ${CONTENT_ASSET_FILES})
35-
string(REPLACE "${CMAKE_SOURCE_DIR}/" "" relative_asset_file ${asset_file})
36-
list(APPEND ASSET_LINK_FLAGS --preload-file ${asset_file}@/${relative_asset_file})
37-
endforeach()
38-
39-
set_target_properties(${APP_LIB_TARGET} PROPERTIES LINK_FLAGS "${ASSET_LINK_FLAGS}")
40-
41-
multicast(set_target_properties PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Config)
42-
multicast(set_target_properties PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Content)
43-
multicast(set_target_properties PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/uvproj.yaml)
44-
endif ()
45-
4622
target_compile_definitions(UntitledImGuiFramework PRIVATE "UIMGUI_COMPILE_LIB" "YAML_CPP_DLL"
4723
"UVK_LOG_EXPORT_FROM_LIBRARY" "UVK_LIB_COMPILE" "URLL_USE_FUNCTIONAL")
4824
if (NOT WIN32)

Framework/cmake/SetupTargetSettings.cmake

+15-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,27 @@
11
if (EMSCRIPTEN)
22

3+
4+
set_target_properties(${APP_LIB_TARGET} PROPERTIES LINK_FLAGS "${ASSET_LINK_FLAGS}")
5+
6+
multicast(set_target_properties PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Config)
7+
multicast(set_target_properties PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Content)
8+
multicast(set_target_properties PROPERTIES LINK_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/uvproj.yaml)
9+
endif ()
10+
11+
if (EMSCRIPTEN)
12+
multicast(target_compile_options PRIVATE -fwasm-exceptions -sSUPPORT_LONGJMP=wasm)
13+
14+
set(EM_LINK_FLAGS "--preload-file ${CMAKE_CURRENT_SOURCE_DIR}/Config@../Config --preload-file ${CMAKE_CURRENT_SOURCE_DIR}/Content@../Content --preload-file ${CMAKE_CURRENT_SOURCE_DIR}/uvproj.yaml@../uvproj.yaml")
15+
316
if (ENABLE_PRE_SCRIPT)
4-
set(EM_LINK_FLAGS "--pre-js ${CMAKE_CURRENT_SOURCE_DIR}/Config/WASM/pre.js")
17+
set(EM_LINK_FLAGS "${EM_LINK_FLAGS} --pre-js ${CMAKE_CURRENT_SOURCE_DIR}/Config/WASM/pre.js")
518
endif()
619

720
if (ENABLE_POST_SCRIPT)
821
set(EM_LINK_FLAGS "${EM_LINK_FLAGS} --post-js ${CMAKE_CURRENT_SOURCE_DIR}/Config/WASM/post.js")
922
endif()
1023

11-
if (DEFINED EM_LINK_FLAGS)
12-
multicast(set_target_properties PROPERTIES LINK_FLAGS "${EM_LINK_FLAGS}")
13-
endif()
24+
multicast(set_target_properties PROPERTIES LINK_FLAGS "${EM_LINK_FLAGS}")
1425
endif()
1526

1627
if (BUILD_VARIANT_STATIC)

0 commit comments

Comments
 (0)