diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fb7abf..9050088 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,9 +37,9 @@ if (EMSCRIPTEN) INTERFACE_COMPILE_OPTIONS ${option} INTERFACE_LINK_OPTIONS ${option}) endfunction() - add_emscripten_library(zlib "SHELL:-s USE_ZLIB=1") - add_emscripten_library(sdl2 "SHELL:-s USE_SDL=2") - add_emscripten_library(sdl2_ttf "SHELL:-s USE_SDL_TTF=2") + add_emscripten_library(zlib -sUSE_ZLIB=1) + add_emscripten_library(sdl2 -sUSE_SDL=2) + add_emscripten_library(sdl2_ttf -sUSE_SDL_TTF=2) set(DEFAULT_FONT_PATH /fonts/) elseif (ANDROID) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5753cbe..88dc07e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -158,15 +158,16 @@ if (EMSCRIPTEN) list(APPEND CMAKE_EXE_LINKER_FLAGS_DEBUG "-O1") target_link_options(xsystem35 PRIVATE - "SHELL:-s ENVIRONMENT=web" - "SHELL:-s ASYNCIFY=1 -s ASYNCIFY_IGNORE_INDIRECT=1" - "SHELL:-s ASYNCIFY_REMOVE=SDL_Delay" - "SHELL:-s ASYNCIFY_IMPORTS=muspcm_load_no,muspcm_load_data,muspcm_load_mixlr,muspcm_waitend,wait_vsync,load_mincho_font" - "SHELL:-s ASYNCIFY_ADD=commands2F60,nact_main,send_agsevent,cb_waitkey_sprite" - "SHELL:-s ALLOW_MEMORY_GROWTH=1" - "SHELL:-s NO_EXIT_RUNTIME=1" - "SHELL:-s EXPORTED_FUNCTIONS=_main,_malloc" - "SHELL:-s EXPORTED_RUNTIME_METHODS=getValue,addRunDependency,removeRunDependency") + -sENVIRONMENT=web + -sASYNCIFY=1 + -sASYNCIFY_IGNORE_INDIRECT=1 + -sASYNCIFY_REMOVE=SDL_Delay + -sASYNCIFY_IMPORTS=muspcm_load_no,muspcm_load_data,muspcm_load_mixlr,muspcm_waitend,wait_vsync,load_mincho_font + -sASYNCIFY_ADD=commands2F60,nact_main,send_agsevent,cb_waitkey_sprite + -sALLOW_MEMORY_GROWTH=1 + -sNO_EXIT_RUNTIME=1 + -sEXPORTED_FUNCTIONS=_main,_malloc + -sEXPORTED_RUNTIME_METHODS=getValue,addRunDependency,removeRunDependency) elseif (ANDROID) target_link_libraries(xsystem35 PRIVATE ${ndk_log})