From 7872542f2b9280d131199eedb5e02963d89c3342 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Fri, 6 Jul 2018 03:55:07 +0200 Subject: [PATCH] emscripten: disable WASM We're not WASM ready, while newer Emscripten enabled it by default. --- cmake/libsuperderpy.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/libsuperderpy.cmake b/cmake/libsuperderpy.cmake index 50d05fe..86cb381 100644 --- a/cmake/libsuperderpy.cmake +++ b/cmake/libsuperderpy.cmake @@ -61,7 +61,7 @@ if (NOT LIBSUPERDERPY_CONFIG_INCLUDED) if(EMSCRIPTEN) set(CMAKE_EXECUTABLE_SUFFIX ".bc") - set(EMSCRIPTEN_USE_FLAGS -s USE_SDL=2 -s USE_FREETYPE=1 -s USE_LIBPNG=1 -s USE_ZLIB=1 -s USE_OGG=1 -s USE_VORBIS=1 -s FULL_ES2=1) + set(EMSCRIPTEN_USE_FLAGS -s USE_SDL=2 -s USE_FREETYPE=1 -s USE_LIBPNG=1 -s USE_ZLIB=1 -s USE_OGG=1 -s USE_VORBIS=1 -s FULL_ES2=1 -s WASM=0) # FIXME set(ALLEGRO5_INCLUDE_DIR ${ALLEGRO_INCLUDE_PATH}) set(ALLEGRO5_ACODEC_INCLUDE_DIR ${ALLEGRO_INCLUDE_PATH}) @@ -127,7 +127,7 @@ endif() add_custom_command(TARGET "libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}" POST_BUILD WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/gamestates" - COMMAND "${CMAKE_C_COMPILER}" ${CFLAGS_LIST} libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}.so -s SIDE_MODULE=1 -o libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}.js + COMMAND "${CMAKE_C_COMPILER}" ${CFLAGS_LIST} libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}.so -s SIDE_MODULE=1 -s WASM=0 -o libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}.js VERBATIM ) install(FILES "${CMAKE_BINARY_DIR}/src/gamestates/libsuperderpy-${LIBSUPERDERPY_GAMENAME}-${name}.js" DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBSUPERDERPY_GAMENAME}/gamestates)