Skip to content

WASI-SDK support for WCLAP #420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baconpaul merged 7 commits into from
Nov 18, 2025
Merged

WASI-SDK support for WCLAP #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6ec955b
Avoid deprecated CMake variables
geraintluff Nov 14, 2025
4a301b0
Add support for WASI-SDK toolchain
geraintluff Nov 17, 2025
0a25e9f
Start WASI-SDK compile/link flags
geraintluff Nov 17, 2025
e057788
Add `-fno-exceptions` to targets for WCLAP with WASI-SDK
geraintluff Nov 17, 2025
0b8ea57
Remove `-emscripten` from WCLAP wrapper filename
geraintluff Nov 17, 2025
feeba15
Remove initial memory size
geraintluff Nov 17, 2025
f43a6e5
Set max memory size
geraintluff Nov 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions cmake/make_clapfirst.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function(make_clapfirst_plugins)
set(C1ST_PLUGIN_FORMATS CLAP VST3 AUV2)
endif()

if (EMSCRIPTEN)
if (EMSCRIPTEN OR (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "wasm32") OR (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "wasm64"))
set(BUILD_CLAP -1)
set(BUILD_VST3 -1)
set(BUILD_AUV2 -1)
Expand Down Expand Up @@ -210,7 +210,7 @@ function(make_clapfirst_plugins)
endif()

if (${BUILD_WCLAP} GREATER -1)
message(STATUS "clap-wrapper: ClapFirst is making a WCLAP (with Emscripten)")
message(STATUS "clap-wrapper: ClapFirst is making a WCLAP")
set(WCLAP_TARGET ${C1ST_TARGET_NAME}_wclap)
add_executable(${WCLAP_TARGET} ${C1ST_ENTRY_SOURCE})
target_link_libraries(${WCLAP_TARGET} PRIVATE ${C1ST_IMPL_TARGET})
Expand All @@ -229,11 +229,15 @@ function(make_clapfirst_plugins)
endif()
endif()

# Emscripten flags
set_target_properties(${WCLAP_TARGET} PROPERTIES
COMPILE_FLAGS "-msimd128" # TODO: add this to the static library as well?
LINK_FLAGS "-msimd128 -sSTANDALONE_WASM --no-entry -s EXPORTED_FUNCTIONS=_clap_entry,_malloc -s INITIAL_MEMORY=512kb -s ALLOW_MEMORY_GROWTH=1 -s ALLOW_TABLE_GROWTH=1 -s PURE_WASI --export-table"
)
if (EMSCRIPTEN)
target_compile_options(${C1ST_IMPL_TARGET} PUBLIC -msimd128 --no-entry)
target_compile_options(${WCLAP_TARGET} PUBLIC -msimd128 --no-entry)
target_link_options(${WCLAP_TARGET} PUBLIC -msimd128 -sSTANDALONE_WASM --no-entry -sEXPORTED_FUNCTIONS=_clap_entry,_malloc -sINITIAL_MEMORY=512kb -sALLOW_MEMORY_GROWTH=1 -sALLOW_TABLE_GROWTH=1 -sPURE_WASI --export-table)
else()
target_compile_options(${C1ST_IMPL_TARGET} PUBLIC -msimd128 -fno-exceptions)
target_compile_options(${WCLAP_TARGET} PUBLIC -msimd128 -fno-exceptions)
target_link_options(${WCLAP_TARGET} PUBLIC -mexec-model=reactor -Wl,--max-memory=4294967296,--export-table,--growable-table,--export=malloc,--export=clap_entry)
endif()

add_dependencies(${ALL_TARGET} ${WCLAP_TARGET})
endif()
Expand Down
6 changes: 3 additions & 3 deletions cmake/wrap_wclap_emscripten.cmake → cmake/wrap_wclap.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This adds a WCLAP target, but must only be called when using Emscripten's toolchain.
# This adds a WCLAP target, but must only be called when building WASM (with Emscripten or WASI-SDK)

function(target_add_wclap_configuration)
set(oneValueArgs
Expand All @@ -8,8 +8,8 @@ function(target_add_wclap_configuration)
)
cmake_parse_arguments(TCLP "" "${oneValueArgs}" "" ${ARGN} )

if (NOT EMSCRIPTEN)
message(FATAL_ERROR "Do not call this outside the Emscripten toolchain")
if (NOT EMSCRIPTEN AND (NOT ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "wasm32") AND (NOT ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "wasm64"))
message(FATAL_ERROR "Do not call this outside the Emscripten/WASI toolchain")
endif()

if (NOT DEFINED TCLP_TARGET)
Expand Down
2 changes: 1 addition & 1 deletion cmake/wrapper_functions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ include(cmake/wrap_auv2.cmake)
include(cmake/wrap_vst3.cmake)
include(cmake/wrap_standalone.cmake)
include(cmake/wrap_clap.cmake)
include(cmake/wrap_wclap_emscripten.cmake)
include(cmake/wrap_wclap.cmake)

include(cmake/make_clapfirst.cmake)