Merge pull request google#548 from google/draco_js_fixes

Fix some javascript issues.
jokester · Aug 27, 2019 · 9fe2b31 · 9fe2b31
2 parents a8f6698 + 092426c
commit 9fe2b31
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git 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)

diff --git 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
@@ -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",