diff Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp @ 1827:21ccc00839f7 StoneWebViewer-2.0

upgrade to Emscripten 2.0.23
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 27 May 2021 11:05:59 +0200
parents a56bf4c534ef
children 023cce3d7844
line wrap: on
line diff
--- a/Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp	Thu May 27 09:11:36 2021 +0200
+++ b/Applications/StoneWebViewer/WebAssembly/StoneWebViewer.cpp	Thu May 27 11:05:59 2021 +0200
@@ -3482,13 +3482,22 @@
   
 
   EMSCRIPTEN_KEEPALIVE
-  void LoadStoneWebViewerVersion()
+  const char* GetStoneWebViewerVersion()
   {
-    try
-    {
-      stringBuffer_.assign(STONE_WEB_VIEWER_VERSION);
-    }
-    EXTERN_CATCH_EXCEPTIONS;
+    return STONE_WEB_VIEWER_VERSION;
+  }
+  
+
+  EMSCRIPTEN_KEEPALIVE
+  const char* GetEmscriptenVersion()
+  {
+    // WARNING - "static" is important, otherwise the string would be
+    // freed when returning to JavaScript
+    static const std::string EMSCRIPTEN_VERSION = (
+      boost::lexical_cast<std::string>(__EMSCRIPTEN_major__) + "." +
+      boost::lexical_cast<std::string>(__EMSCRIPTEN_minor__) + "." +
+      boost::lexical_cast<std::string>(__EMSCRIPTEN_tiny__));
+    return EMSCRIPTEN_VERSION.c_str();
   }