From 935f182bb30a94cc0e259565ef1d0d0e13bee1a5 Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Tue, 27 Aug 2019 10:48:11 -0700 Subject: [PATCH 1/2] draco js: Silence binyaren warning ELIMINATE_DUPLICATE_FUNCTIONS=1 is no longer required: it is now a default. --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7948cbf..67219e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -674,8 +674,6 @@ if(EMSCRIPTEN AND ENABLE_JS_GLUE) require_compiler_flag("-s PRECISE_F32=1" YES) if(ENABLE_WASM) require_compiler_flag("-s WASM=1" YES) - else() - require_compiler_flag("-s ELIMINATE_DUPLICATE_FUNCTIONS=1" YES) endif() if(IE_COMPATIBLE) require_compiler_flag("-s LEGACY_VM_SUPPORT=1" YES) From 092426caa6227ec34801032a68bf4ac2f84a7e84 Mon Sep 17 00:00:00 2001 From: Tom Finegan Date: Tue, 27 Aug 2019 10:49:00 -0700 Subject: [PATCH 2/2] draco js: Fix omitted update of ERROR -> DRACO_ERROR --- src/draco/javascript/emscripten/draco_animation_web_decoder.idl | 2 +- src/draco/javascript/emscripten/draco_web_decoder.idl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/draco/javascript/emscripten/draco_animation_web_decoder.idl b/src/draco/javascript/emscripten/draco_animation_web_decoder.idl index 6d3b2cb..c9fe76b 100644 --- a/src/draco/javascript/emscripten/draco_animation_web_decoder.idl +++ b/src/draco/javascript/emscripten/draco_animation_web_decoder.idl @@ -8,7 +8,7 @@ interface DecoderBuffer { enum draco_StatusCode { "draco_Status::OK", - "draco_Status::ERROR", + "draco_Status::DRACO_ERROR", "draco_Status::IO_ERROR", "draco_Status::INVALID_PARAMETER", "draco_Status::UNSUPPORTED_VERSION", diff --git a/src/draco/javascript/emscripten/draco_web_decoder.idl b/src/draco/javascript/emscripten/draco_web_decoder.idl index 184edd4..e789d1c 100644 --- a/src/draco/javascript/emscripten/draco_web_decoder.idl +++ b/src/draco/javascript/emscripten/draco_web_decoder.idl @@ -97,7 +97,7 @@ interface Metadata { enum draco_StatusCode { "draco_Status::OK", - "draco_Status::ERROR", + "draco_Status::DRACO_ERROR", "draco_Status::IO_ERROR", "draco_Status::INVALID_PARAMETER", "draco_Status::UNSUPPORTED_VERSION",