From b5ca70530eba7fb8dc444e1a56b54db8ac2bb12b Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 24 Dec 2018 04:10:26 +0300 Subject: [PATCH] Update Emscripten build scripts. GitOrigin-RevId: 2e92e3d3f6ef91ffe7dcf1a60a276c07c09035ca --- CMakeLists.txt | 4 ++-- example/web/copy-tdlib.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 682602363..ad21f2701 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,8 +89,8 @@ if (EMSCRIPTEN) if (ASMJS) set(TD_EMSCRIPTEN td_asmjs) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s WASM=0") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s WASM=0") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s WASM=0 -Wno-almost-asm") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -s WASM=0 -Wno-almost-asm") else() set(TD_EMSCRIPTEN td_wasm) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s WASM=1") diff --git a/example/web/copy-tdlib.sh b/example/web/copy-tdlib.sh index f63dfeb54..a09933f67 100755 --- a/example/web/copy-tdlib.sh +++ b/example/web/copy-tdlib.sh @@ -2,5 +2,5 @@ DEST=tdweb/src/prebuilt/release/ mkdir -p $DEST -cp build/wasm/td_wasm.{js,wasm} $DEST -cp build/asmjs/td_asmjs.js{,.mem} $DEST +cp build/wasm/td_wasm.js build/wasm/td_wasm.wasm $DEST +cp build/asmjs/td_asmjs.js build/asmjs/td_asmjs.js.mem $DEST