enable support for sockdrive in dosbox-x

CMakeLists.txt

@@ -64,7 +64,7 @@ endif()
 
 include_directories(
 		"${SRC_DIR}/protocol"
-		"${NATIVE_DIR}/sockdrive/lib/ffi"
+		"${NATIVE_DIR}/sockdrive/include"
 )
 
 # tier 1

native/jsdos/include/jsdos-drive.h

@@ -10,14 +10,13 @@
 namespace jsdos {
     class SockDrive: public imageDisk {
         size_t handle;
+        SockDrive(size_t handle, const std::string& url, const std::string& owner, const std::string& name);
     public:
-        SockDrive(const std::string& host, uint16_t port);
-
         virtual ~SockDrive();
-
         virtual uint8_t Read_AbsoluteSector(uint32_t sectnum, void* data) override;
-
         virtual uint8_t Write_AbsoluteSector(uint32_t sectnum, const void* data) override;
+
+        static SockDrive* create(const std::string& url, const std::string& owner, const std::string& name);
     };
 }
 

native/jsdos/jsdos-drive.cpp

@@ -1,21 +1,25 @@
 //
-// Created by caiii on 23.08.2023.
+// Created by caiiiycuk on 23.08.2023.
 //
 
 #include <cassert>
 #include <jsdos-drive.h>
 #include <sockdrive.h>
-
 #include <cstdio>
 
-constexpr uint32_t diskSize = 2097152;
-constexpr uint32_t sectorSize = 512;
 
-jsdos::SockDrive::SockDrive(const std::string& host, uint16_t port):
-    imageDisk(nullptr, (std::string(host) + ":" + std::to_string(port)).c_str(), diskSize, true) {
-    handle = sockdrive_open(host.c_str(), port);
-    const uint64_t heads = (double) diskSize / sectorSize / 520 / 63 * 1024;
-    this->Set_Geometry(heads, 520, 63, sectorSize);
+jsdos::SockDrive* jsdos::SockDrive::create(const std::string& url, const std::string& owner, const std::string& name) {
+    auto handle = sockdrive_open(url.c_str(), owner.c_str(), name.c_str(), "");
+    if (handle) {
+       return new jsdos::SockDrive(handle, url, owner, name); 
+    }
+
+    return nullptr;
+}
+
+jsdos::SockDrive::SockDrive(size_t handle, const std::string& url, const std::string& owner, const std::string& name):
+    imageDisk::imageDisk(nullptr, (url + "{" + owner + "/" + name + "}").c_str(), sockdrive_size(handle), true), handle(handle) {
+    this->Set_Geometry(sockdrive_heads(handle), sockdrive_cylinders(handle), sockdrive_sectors(handle), sockdrive_sector_size(handle));
 }
 
 jsdos::SockDrive::~SockDrive() {

src/build.ts

@@ -5,22 +5,22 @@
 // gulpfile.ts/wasm.ts --> generateBuildInfo
 
 export const Build = {
-    version: "0.80.18 (73e5a9a9e1f3043ad1b38a6ef73fbe2a)",
-    buildSeed: 1695124915487,
+    version: "0.80.18 (d3c15b448bdaacba7e7d417b0bc1246f)",
+    buildSeed: 1697024747026,
     "wdosbox-x.wasm": {
-        "size": 6500306,
+        "size": 8647420,
         "gzSize": 0
     },
     "wdosbox-x.js": {
-        "size": 250895,
+        "size": 287862,
         "gzSize": 0
     },
     "wdosbox.wasm": {
         "size": 1466616,
         "gzSize": 0
     },
     "wdosbox.js": {
-        "size": 128241,
+        "size": 128275,
         "gzSize": 0
     },
     "wlibzip.wasm": {

src/dos/dosbox/cpp/worker-protocol.cpp

@@ -124,6 +124,7 @@ EM_JS(void, ws_init_runtime, (const char* sessionId), {
 
       switch (data.name) {
         case "wc-run": {
+          Module.token = data.props.token || "";
           Module._extractBundleToFs();
           Module._runRuntime();
           sendMessage("ws-server-ready");

src/emulators.ts

@@ -17,6 +17,7 @@ export enum NetworkType {
 /* eslint-enable no-unused-vars */
 
 export interface BackendOptions {
+    token?: string | undefined;
     onExtractProgress?: (bundleIndex: number, file: string, extracted: number, total: number) => void;
 }
 

src/protocol/protocol.ts

@@ -193,7 +193,7 @@ export class CommandInterfaceOverTransportLayer implements CommandInterface {
 
                 sendBundles()
                     .then(() => {
-                        this.sendClientMessage("wc-run", {});
+                        this.sendClientMessage("wc-run", { token: this.options.token });
                     })
                     .catch((e) => {
                         this.onErr("panic", "Can't send bundles to backend: " + e.message);

targets/dosbox-x-asyncify.txt

@@ -1 +1 @@
-["BIOS::cb_bios_boot__func","BIOS::cb_bios_post__func","BIOS::cb_bios_startup_screen__func","BIOS_Int10RightJustifiedPrint","BOOT::Run","BOOT::printError","CALLBACK_Idle","CALLBACK_RunRealFar","CALLBACK_RunRealInt","CHOICE::Run","CPU_ForceV86FakeIO_In","CPU_ForceV86FakeIO_Out","ConnectToServer","DOSBOX_RunMachine","DOS_21Handler","DOS_CheckExtDevice","DOS_CloseFile","DOS_CreateFile","DOS_Device::GetInformation","DOS_Device::Read","DOS_Device::Write","DOS_FindDevice","DOS_GetSTDINStatus","DOS_MakeDir","DOS_OpenFile","DOS_ReadFile","DOS_Shell::BuildCompletions","DOS_Shell::CMD_CHDIR","DOS_Shell::CMD_CLS","DOS_Shell::CMD_COPY","DOS_Shell::CMD_DELETE","DOS_Shell::CMD_DIR","DOS_Shell::CMD_ECHO","DOS_Shell::CMD_PAUSE","DOS_Shell::CMD_TYPE","DOS_Shell::CMD_VOL","DOS_Shell::DoCommand","DOS_Shell::Execute","DOS_Shell::ParseLine","DOS_Shell::Prepare","DOS_Shell::Run","DOS_Shell::ShowPrompt","DOS_Shell::execute_shell_cmd","DOS_WriteFile","EGA16_FillRow","ExceptionPageHandler::Exception","ExceptionPageHandler::writeb","ExceptionPageHandler::writed","ExceptionPageHandler::writew","FinishSetMode","IDE_DelayedCommand","IDE_SelfIO_In","IDE_SelfIO_Out","IMGMAKE::Run","IMGMAKE::printHelp","IMGMOUNT::DetectGeometry","IMGMOUNT::MountFat","IMGMOUNT::MountImageNone","IMGMOUNT::Run","INT10_Handler","INT10_LoadFont","INT10_PutPixel","INT10_ReloadFont","INT10_ScrollWindow","INT10_SetActivePage","INT10_SetCursorPos","INT10_SetCursorShape","INT10_SetSingleDACRegister","INT10_SetVideoMode","INT10_TeletypeOutput","INT10_TeletypeOutputAttr","INT10_ToggleBlinkingBit","INT10_WriteChar","INT13_DiskHandler","INT15_Handler","INT8_Handler","IO_ReadB","IO_WriteB","IPXNET::Run","MEM_BlockCopy","MOUNT::Run","NewInitPageHandler::InitPage","NewInitPageHandler::readb","NewInitPageHandler::writeb","NewInitPageHandler::writew","Normal_Loop","PAGING_NewPageFault","PROGRAMS_Handler","Program::WriteOut","Program::WriteOut_NoParsing","SDLNet_TCP_Send","SHELL_Init","SHELL_Run","VGA_ROM_BIOS_ENTRY_callback_func","WriteChar","asyncify_sleep","backone","byn$mgfn-shared$IO_ReadB","byn$mgfn-shared$IO_WriteB","device_CON::AdjustCursorPosition","device_CON::GetInformation","device_CON::Output","device_CON::Read","device_CON::Real_INT10_SetCursorPos","device_CON::Real_INT10_TeletypeOutput","device_CON::Real_INT10_TeletypeOutputAttr","device_CON::Write","fatDrive::FileCreate","fatDrive::MakeDir","fatFile::Close","fatFile::Flush","fatFromDOSDrive::GetUnmodifiedSector","fatFromDOSDrive::ReadSector","imageDisk::Read_AbsoluteSector","imageDisk::Read_Sector","imageDisk::Write_Sector","initcodepagefont","jsdos::SockDrive::Read_AbsoluteSector","jsdos_main","localFile::Close","localFile::Flush","localFile::Read","localFile::UpdateLocalDateTime","mem_memcpy","mem_readb","mem_writeb","mem_writed","mem_writew","outc","runRuntime","server_network_connect","server_run","showWelcome","time_t_to_DOS_DateTime","BIOS::cb_bios_boot__func(*)*","BIOS::cb_bios_post__func(*)*","BIOS::cb_bios_startup_screen__func(*)*","BIOS_Int10RightJustifiedPrint(*)*","BOOT::Run(*)*","BOOT::printError(*)*","CALLBACK_Idle(*)*","CALLBACK_RunRealFar(*)*","CALLBACK_RunRealInt(*)*","CHOICE::Run(*)*","CPU_ForceV86FakeIO_In(*)*","CPU_ForceV86FakeIO_Out(*)*","ConnectToServer(*)*","DOSBOX_RunMachine(*)*","DOS_21Handler(*)*","DOS_CheckExtDevice(*)*","DOS_CloseFile(*)*","DOS_CreateFile(*)*","DOS_Device::GetInformation(*)*","DOS_Device::Read(*)*","DOS_Device::Write(*)*","DOS_FindDevice(*)*","DOS_GetSTDINStatus(*)*","DOS_MakeDir(*)*","DOS_OpenFile(*)*","DOS_ReadFile(*)*","DOS_Shell::BuildCompletions(*)*","DOS_Shell::CMD_CHDIR(*)*","DOS_Shell::CMD_CLS(*)*","DOS_Shell::CMD_COPY(*)*","DOS_Shell::CMD_DELETE(*)*","DOS_Shell::CMD_DIR(*)*","DOS_Shell::CMD_ECHO(*)*","DOS_Shell::CMD_PAUSE(*)*","DOS_Shell::CMD_TYPE(*)*","DOS_Shell::CMD_VOL(*)*","DOS_Shell::DoCommand(*)*","DOS_Shell::Execute(*)*","DOS_Shell::ParseLine(*)*","DOS_Shell::Prepare(*)*","DOS_Shell::Run(*)*","DOS_Shell::ShowPrompt(*)*","DOS_Shell::execute_shell_cmd(*)*","DOS_WriteFile(*)*","EGA16_FillRow(*)*","ExceptionPageHandler::Exception(*)*","ExceptionPageHandler::writeb(*)*","ExceptionPageHandler::writed(*)*","ExceptionPageHandler::writew(*)*","FinishSetMode(*)*","IDE_DelayedCommand(*)*","IDE_SelfIO_In(*)*","IDE_SelfIO_Out(*)*","IMGMAKE::Run(*)*","IMGMAKE::printHelp(*)*","IMGMOUNT::DetectGeometry(*)*","IMGMOUNT::MountFat(*)*","IMGMOUNT::MountImageNone(*)*","IMGMOUNT::Run(*)*","INT10_Handler(*)*","INT10_LoadFont(*)*","INT10_PutPixel(*)*","INT10_ReloadFont(*)*","INT10_ScrollWindow(*)*","INT10_SetActivePage(*)*","INT10_SetCursorPos(*)*","INT10_SetCursorShape(*)*","INT10_SetSingleDACRegister(*)*","INT10_SetVideoMode(*)*","INT10_TeletypeOutput(*)*","INT10_TeletypeOutputAttr(*)*","INT10_ToggleBlinkingBit(*)*","INT10_WriteChar(*)*","INT13_DiskHandler(*)*","INT15_Handler(*)*","INT8_Handler(*)*","IO_ReadB(*)*","IO_WriteB(*)*","IPXNET::Run(*)*","MEM_BlockCopy(*)*","MOUNT::Run(*)*","NewInitPageHandler::InitPage(*)*","NewInitPageHandler::readb(*)*","NewInitPageHandler::writeb(*)*","NewInitPageHandler::writew(*)*","Normal_Loop(*)*","PAGING_NewPageFault(*)*","PROGRAMS_Handler(*)*","Program::WriteOut(*)*","Program::WriteOut_NoParsing(*)*","SDLNet_TCP_Send(*)*","SHELL_Init(*)*","SHELL_Run(*)*","VGA_ROM_BIOS_ENTRY_callback_func(*)*","WriteChar(*)*","asyncify_sleep(*)*","backone(*)*","byn$mgfn-shared$IO_ReadB(*)*","byn$mgfn-shared$IO_WriteB(*)*","device_CON::AdjustCursorPosition(*)*","device_CON::GetInformation(*)*","device_CON::Output(*)*","device_CON::Read(*)*","device_CON::Real_INT10_SetCursorPos(*)*","device_CON::Real_INT10_TeletypeOutput(*)*","device_CON::Real_INT10_TeletypeOutputAttr(*)*","device_CON::Write(*)*","fatDrive::FileCreate(*)*","fatDrive::MakeDir(*)*","fatFile::Close(*)*","fatFile::Flush(*)*","fatFromDOSDrive::GetUnmodifiedSector(*)*","fatFromDOSDrive::ReadSector(*)*","imageDisk::Read_AbsoluteSector(*)*","imageDisk::Read_Sector(*)*","imageDisk::Write_Sector(*)*","initcodepagefont(*)*","jsdos::SockDrive::Read_AbsoluteSector(*)*","jsdos_main(*)*","localFile::Close(*)*","localFile::Flush(*)*","localFile::Read(*)*","localFile::UpdateLocalDateTime(*)*","mem_memcpy(*)*","mem_readb(*)*","mem_writeb(*)*","mem_writed(*)*","mem_writew(*)*","outc(*)*","runRuntime(*)*","server_network_connect(*)*","server_run(*)*","showWelcome(*)*","time_t_to_DOS_DateTime(*)*"]
+["BIOS::cb_bios_boot__func","BIOS::cb_bios_post__func","BIOS::cb_bios_startup_screen__func","BIOS_Int10RightJustifiedPrint","BOOT::Run","BOOT::printError","CALLBACK_Idle","CALLBACK_RunRealFar","CALLBACK_RunRealInt","CHOICE::Run","CPU_ForceV86FakeIO_In","CPU_ForceV86FakeIO_Out","ConnectToServer","DOSBOX_RunMachine","DOS_21Handler","DOS_CheckExtDevice","DOS_CloseFile","DOS_CreateFile","DOS_Device::GetInformation","DOS_Device::Read","DOS_Device::Write","DOS_FindDevice","DOS_GetSTDINStatus","DOS_MakeDir","DOS_OpenFile","DOS_ReadFile","DOS_Shell::BuildCompletions","DOS_Shell::CMD_CHDIR","DOS_Shell::CMD_CLS","DOS_Shell::CMD_COPY","DOS_Shell::CMD_DELETE","DOS_Shell::CMD_DIR","DOS_Shell::CMD_ECHO","DOS_Shell::CMD_PAUSE","DOS_Shell::CMD_TYPE","DOS_Shell::CMD_VOL","DOS_Shell::DoCommand","DOS_Shell::Execute","DOS_Shell::ParseLine","DOS_Shell::Prepare","DOS_Shell::Run","DOS_Shell::ShowPrompt","DOS_Shell::execute_shell_cmd","DOS_WriteFile","EGA16_FillRow","ExceptionPageHandler::Exception","ExceptionPageHandler::writeb","ExceptionPageHandler::writed","ExceptionPageHandler::writew","FinishSetMode","IDE_DelayedCommand","IDE_SelfIO_In","IDE_SelfIO_Out","IMGMAKE::Run","IMGMAKE::printHelp","IMGMOUNT::DetectGeometry","IMGMOUNT::MountFat","IMGMOUNT::MountImageNone","IMGMOUNT::Run","INT10_Handler","INT10_LoadFont","INT10_PutPixel","INT10_ReloadFont","INT10_ScrollWindow","INT10_SetActivePage","INT10_SetCursorPos","INT10_SetCursorShape","INT10_SetSingleDACRegister","INT10_SetVideoMode","INT10_TeletypeOutput","INT10_TeletypeOutputAttr","INT10_ToggleBlinkingBit","INT10_WriteChar","INT13_DiskHandler","INT15_Handler","INT8_Handler","IO_ReadB","IO_WriteB","IPXNET::Run","MEM_BlockCopy","MOUNT::Run","NewInitPageHandler::InitPage","NewInitPageHandler::readb","NewInitPageHandler::writeb","NewInitPageHandler::writew","Normal_Loop","PAGING_NewPageFault","PROGRAMS_Handler","Program::WriteOut","Program::WriteOut_NoParsing","SDLNet_TCP_Send","SHELL_Init","SHELL_Run","VGA_ROM_BIOS_ENTRY_callback_func","WriteChar","asyncify_sleep","backone","byn$mgfn-shared$IO_ReadB","byn$mgfn-shared$IO_WriteB","device_CON::AdjustCursorPosition","device_CON::GetInformation","device_CON::Output","device_CON::Read","device_CON::Real_INT10_SetCursorPos","device_CON::Real_INT10_TeletypeOutput","device_CON::Real_INT10_TeletypeOutputAttr","device_CON::Write","fatDrive::FileCreate","fatDrive::MakeDir","fatFile::Close","fatFile::Flush","fatFromDOSDrive::GetUnmodifiedSector","fatFromDOSDrive::ReadSector","imageDisk::Read_AbsoluteSector","imageDisk::Read_Sector","imageDisk::Write_Sector","initcodepagefont","jsdos::SockDrive::Read_AbsoluteSector","jsdos::SockDrive::create","jsdos_main","localFile::Close","localFile::Flush","localFile::Read","localFile::UpdateLocalDateTime","mem_memcpy","mem_readb","mem_writeb","mem_writed","mem_writew","outc","runRuntime","server_network_connect","server_run","showWelcome","time_t_to_DOS_DateTime","BIOS::cb_bios_boot__func(*)*","BIOS::cb_bios_post__func(*)*","BIOS::cb_bios_startup_screen__func(*)*","BIOS_Int10RightJustifiedPrint(*)*","BOOT::Run(*)*","BOOT::printError(*)*","CALLBACK_Idle(*)*","CALLBACK_RunRealFar(*)*","CALLBACK_RunRealInt(*)*","CHOICE::Run(*)*","CPU_ForceV86FakeIO_In(*)*","CPU_ForceV86FakeIO_Out(*)*","ConnectToServer(*)*","DOSBOX_RunMachine(*)*","DOS_21Handler(*)*","DOS_CheckExtDevice(*)*","DOS_CloseFile(*)*","DOS_CreateFile(*)*","DOS_Device::GetInformation(*)*","DOS_Device::Read(*)*","DOS_Device::Write(*)*","DOS_FindDevice(*)*","DOS_GetSTDINStatus(*)*","DOS_MakeDir(*)*","DOS_OpenFile(*)*","DOS_ReadFile(*)*","DOS_Shell::BuildCompletions(*)*","DOS_Shell::CMD_CHDIR(*)*","DOS_Shell::CMD_CLS(*)*","DOS_Shell::CMD_COPY(*)*","DOS_Shell::CMD_DELETE(*)*","DOS_Shell::CMD_DIR(*)*","DOS_Shell::CMD_ECHO(*)*","DOS_Shell::CMD_PAUSE(*)*","DOS_Shell::CMD_TYPE(*)*","DOS_Shell::CMD_VOL(*)*","DOS_Shell::DoCommand(*)*","DOS_Shell::Execute(*)*","DOS_Shell::ParseLine(*)*","DOS_Shell::Prepare(*)*","DOS_Shell::Run(*)*","DOS_Shell::ShowPrompt(*)*","DOS_Shell::execute_shell_cmd(*)*","DOS_WriteFile(*)*","EGA16_FillRow(*)*","ExceptionPageHandler::Exception(*)*","ExceptionPageHandler::writeb(*)*","ExceptionPageHandler::writed(*)*","ExceptionPageHandler::writew(*)*","FinishSetMode(*)*","IDE_DelayedCommand(*)*","IDE_SelfIO_In(*)*","IDE_SelfIO_Out(*)*","IMGMAKE::Run(*)*","IMGMAKE::printHelp(*)*","IMGMOUNT::DetectGeometry(*)*","IMGMOUNT::MountFat(*)*","IMGMOUNT::MountImageNone(*)*","IMGMOUNT::Run(*)*","INT10_Handler(*)*","INT10_LoadFont(*)*","INT10_PutPixel(*)*","INT10_ReloadFont(*)*","INT10_ScrollWindow(*)*","INT10_SetActivePage(*)*","INT10_SetCursorPos(*)*","INT10_SetCursorShape(*)*","INT10_SetSingleDACRegister(*)*","INT10_SetVideoMode(*)*","INT10_TeletypeOutput(*)*","INT10_TeletypeOutputAttr(*)*","INT10_ToggleBlinkingBit(*)*","INT10_WriteChar(*)*","INT13_DiskHandler(*)*","INT15_Handler(*)*","INT8_Handler(*)*","IO_ReadB(*)*","IO_WriteB(*)*","IPXNET::Run(*)*","MEM_BlockCopy(*)*","MOUNT::Run(*)*","NewInitPageHandler::InitPage(*)*","NewInitPageHandler::readb(*)*","NewInitPageHandler::writeb(*)*","NewInitPageHandler::writew(*)*","Normal_Loop(*)*","PAGING_NewPageFault(*)*","PROGRAMS_Handler(*)*","Program::WriteOut(*)*","Program::WriteOut_NoParsing(*)*","SDLNet_TCP_Send(*)*","SHELL_Init(*)*","SHELL_Run(*)*","VGA_ROM_BIOS_ENTRY_callback_func(*)*","WriteChar(*)*","asyncify_sleep(*)*","backone(*)*","byn$mgfn-shared$IO_ReadB(*)*","byn$mgfn-shared$IO_WriteB(*)*","device_CON::AdjustCursorPosition(*)*","device_CON::GetInformation(*)*","device_CON::Output(*)*","device_CON::Read(*)*","device_CON::Real_INT10_SetCursorPos(*)*","device_CON::Real_INT10_TeletypeOutput(*)*","device_CON::Real_INT10_TeletypeOutputAttr(*)*","device_CON::Write(*)*","fatDrive::FileCreate(*)*","fatDrive::MakeDir(*)*","fatFile::Close(*)*","fatFile::Flush(*)*","fatFromDOSDrive::GetUnmodifiedSector(*)*","fatFromDOSDrive::ReadSector(*)*","imageDisk::Read_AbsoluteSector(*)*","imageDisk::Read_Sector(*)*","imageDisk::Write_Sector(*)*","initcodepagefont(*)*","jsdos::SockDrive::Read_AbsoluteSector(*)*","jsdos::SockDrive::create(*)*","jsdos_main(*)*","localFile::Close(*)*","localFile::Flush(*)*","localFile::Read(*)*","localFile::UpdateLocalDateTime(*)*","mem_memcpy(*)*","mem_readb(*)*","mem_writeb(*)*","mem_writed(*)*","mem_writew(*)*","outc(*)*","runRuntime(*)*","server_network_connect(*)*","server_run(*)*","showWelcome(*)*","time_t_to_DOS_DateTime(*)*"]

targets/dosbox-x-sdl2.cmake

@@ -619,7 +619,7 @@ 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/lib/ffi/SDL2/sockdrive.cpp"
+        "${NATIVE_DIR}/sockdrive/SDL2/sockdrive.cpp"
         )
 
 set(SOURCES_X_JSDOS_CORE
@@ -630,7 +630,7 @@ 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/lib/ffi/lz4/lz4.c"
+        "${NATIVE_DIR}/sockdrive/lz4/lz4.c"
         )
 
 set(SOURCES_X_JSDOS_MAIN
@@ -641,7 +641,7 @@ set(SOURCES_X_JSDOS_MAIN
         "${NATIVE_DIR}/sdl2net/SDLnet.c"
         "${NATIVE_DIR}/sdl2net/SDLnetTCP.c"
         "${NATIVE_DIR}/sdl2net/SDLnetselect.c"
-        "${NATIVE_DIR}/sockdrive/lib/ffi/js/sockdrive.cpp"
+        "${NATIVE_DIR}/sockdrive/js/sockdrive.cpp"
         )
 
 add_library(libdosbox-x-sdl2 OBJECT ${SOURCES_X_SDL} ${SOURCES_X_CORE} ${SOURCES_X_JSDOS_CORE})
@@ -707,8 +707,8 @@ if (${EMSCRIPTEN})
             -fwasm-exceptions
             "-sUSE_ZLIB=1"
             "-sUSE_SDL=2"
-        #    "--profiling-funcs"
-        #    "-sASSERTIONS=1"
+           #    "--profiling-funcs"
+           #    "-sASSERTIONS=1"
         #    "-sSAFE_HEAP=2"
             "-sASYNCIFY=1"
             "-sASYNCIFY_IMPORTS=['syncSleep']"