update libs, emsdk and using a constexpr divisor

michelerenzullo · Oct 20, 2022 · 2cea0b3 · 2cea0b3
1 parent c5d15f6
commit 2cea0b3
Show file tree

Hide file tree

Showing 13 changed files with 1,025 additions and 953 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -1,20 +1,10 @@
-{"version": "2.0.0",/*
-    "windows": {
-        "options": {
-            "shell": {
-                "executable": "cmd.exe",
-                "args": [
-                    "/d", "/c"
-                ]
-            }
-        }
-    },*/
+{"version": "2.0.0",
     "tasks": [
         {
-            "label": "emscripten",
-            "type": "shell",
-            "command": "em++",
-            "args": [	
+			"type": "cppbuild",
+			"label": "standard",
+			"command": "em++",
+			"args": [	
 				"sources/lightMD5.cpp",			
                 "sources/xmp_webconverter.cpp",
 				"-std=c++2a",

diff --git a/build.txt b/build.txt
@@ -1,4 +1,4 @@
-emsdk v3.1.14 includes already compiled zlib v1.2.12.1, light-md5(https://github.com/michelerenzullo/light-md5) and minizip-ng v3.0.6.
+emsdk v3.1.23 includes already compiled zlib v1.2.13, light-md5(https://github.com/michelerenzullo/light-md5) and minizip-ng v3.0.7.
 I've made a little patch on embind.js in order to allow "optionals" arguments for options_setter function, if you use a new version of emsdk please build again libs.
 
 

diff --git a/emsdk/upstream/emscripten/cache/sysroot/include/CUBEParser.h b/emsdk/upstream/emscripten/cache/sysroot/include/CUBEParser.h
@@ -84,7 +84,7 @@ int32_t CUBEParser(char* const file, int32_t mode, char* title, int32_t* size, d
 			*size = input_size;
 
 			char* search_start = text_;
-			while (*search_start) if (*search_start++ == '\n' && *search_start <= '9' && *search_start >= '0') break;
+			while (*search_start) if (*search_start++ == '\n' && (*search_start == '-' || (*search_start <= '9' && *search_start >= '0'))) break;
 			if (*search_start) {
 
 				double* samples = (double*)malloc(sizeof(double) * (size_t)pow(input_size, 3) * 3);

diff --git a/emsdk/upstream/emscripten/cache/sysroot/include/mz.h b/emsdk/upstream/emscripten/cache/sysroot/include/mz.h
@@ -14,8 +14,8 @@
 /***************************************************************************/
 
 /* MZ_VERSION */
-#define MZ_VERSION                      ("3.0.6")
-#define MZ_VERSION_BUILD                (030006)
+#define MZ_VERSION                      ("3.0.7")
+#define MZ_VERSION_BUILD                (030007)
 
 /* MZ_ERROR */
 #define MZ_OK                           (0)  /* zlib */