v8.1.0

caiiiycuk · May 21, 2024 · c175091 · c175091
1 parent fba236b
commit c175091
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/gulpfile.ts/cmake.ts b/gulpfile.ts/cmake.ts
@@ -1,6 +1,7 @@
 import * as process from "process";
 import * as fs from "fs-extra";
 import * as path from "path";
+import { cpus } from "os";
 import { execute } from "./execute";
 
 export default async function make(listsPath: string,
@@ -22,7 +23,7 @@ export default async function make(listsPath: string,
 }
 
 async function makeBuild(...targets: string[]) {
-    await execute("ninja", "-j16", ...targets);
+    await execute("ninja", "-j" + cpus().length, ...targets);
 }
 
 async function emcmake(listsPath: string) {

diff --git a/native/sockdrive b/native/sockdrive
diff --git a/src/build.ts b/src/build.ts
@@ -5,14 +5,14 @@
 // gulpfile.ts/wasm.ts --> generateBuildInfo
 
 export const Build = {
-    version: "0.80.23 (c49efab75bfea005569c13a463cb08c1)",
-    buildSeed: 1714984446345,
+    version: "8.1.0 (a6f1c8c1274ce3a99d05b80f58468e5b)",
+    buildSeed: 1715896282098,
     "wdosbox-x.wasm": {
-        "size": 6525787,
+        "size": 6547079,
         "gzSize": 0
     },
     "wdosbox-x.js": {
-        "size": 252409,
+        "size": 252522,
         "gzSize": 0
     },
     "wdosbox.wasm": {

diff --git a/src/dos/dosbox/cpp/worker-protocol.cpp b/src/dos/dosbox/cpp/worker-protocol.cpp
@@ -713,8 +713,8 @@ EM_ASYNC_JS(size_t, em_sockdrive_open, (const char* url,
     if (!Module.sockdrive) {
         jsImpl = UTF8ToString(jsImpl);
         eval(jsImpl);
-        Module.sockdrive.onOpen =  (drive, read, write) => {
-            Module.log("sockdrive: " + drive + ", read=" + read + ", write=" + write);
+        Module.sockdrive.onOpen =  (drive, read, write, imageSize, preloadQueue) => {
+            Module.log("sockdrive: " + drive + ", read=" + read + ", write=" + write + ", imageSize=" + Math.round(imageSize / 1024 / 1024) + "Mb" + ", preloadQueue=" + preloadQueue.length);
         };
         Module.sockdrive.onError = (e) => {
             Module.err(e.message ?? "unable to open sockdrive");

diff --git a/targets/dosbox-x-sdl2.cmake b/targets/dosbox-x-sdl2.cmake
@@ -622,7 +622,8 @@ set(SOURCES_X_SDL_MAIN
         "${DBX_PATH}/src/hardware/mixer.cpp"
         "${DBX_PATH}/src/hardware/ipx.cpp"
         "${DBX_PATH}/src/hardware/ipxserver.cpp"
-        "${NATIVE_DIR}/sockdrive/SDL2/sockdrive.cpp"
+        "${DBX_PATH}/src/hardware/imfc.cpp"
+        "${NATIVE_DIR}/jsdos/sockdrive-noop.cpp"
         )
 
 set(SOURCES_X_JSDOS_CORE
@@ -633,7 +634,6 @@ set(SOURCES_X_JSDOS_CORE
         "${NATIVE_DIR}/jsdos/jsdos-support.cpp"
         "${NATIVE_DIR}/jsdos/jsdos-events.cpp"
         "${NATIVE_DIR}/jsdos/jsdos-drive.cpp"
-        "${NATIVE_DIR}/sockdrive/lz4/lz4.c"
         )
 
 set(SOURCES_X_JSDOS_MAIN
+26 −3		README.md
+0 −164		SDL2/sockdrive.cpp
+0 −240		include/LRUCache11.hpp
+0 −55		include/blockcache.h
+0 −70		js/README.md
+52 −54		js/src/sockdrive-fat.ts
+11 −13		js/src/sockdrive-native.ts
+188 −101		js/src/sockdrive/drive.ts
+4 −0		js/src/sockdrive/types.ts
+102 −0		js/src/test/test.ts
+0 −2,773		lz4/lz4.c
+0 −862		lz4/lz4.h