Test I guess

hydra-emu · Jan 10, 2024 · 4c4440a · 4c4440a
1 parent 06e2ce1
commit 4c4440a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/Web.yml b/.github/workflows/Web.yml
@@ -15,8 +15,9 @@ jobs:
           actions-cache-folder: 'emsdk-cache'
       - name: Build
         run: |
+          export EMCC_FORCE_STDLIBS=libc++,libc++abi
           emcmake cmake -B build
-          cmake --build build --config Release
+          cmake --build build
           mv data/hydra.ico build/favicon.ico
           mv build/hydra.html build/index.html
       - name: Deploy

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -78,7 +78,7 @@ elseif(HYDRA_WEB)
     set(CMAKE_CXX_FLAGS "-fPIC")
     set(LONG_INT 8) # for openssl
     set(CMAKE_EXECUTABLE_SUFFIX ".html")
-    set_target_properties(hydra PROPERTIES LINK_FLAGS "-sASSERTIONS -sEXPORTED_FUNCTIONS=[_malloc,_free,_main,_main_impl] -sEXPORTED_RUNTIME_METHODS=ccall -sNO_DISABLE_EXCEPTION_CATCHING -sALLOW_MEMORY_GROWTH -sTOTAL_MEMORY=192MB -lidbfs.js -s ELIMINATE_DUPLICATE_FUNCTIONS=1 --shell-file ${PROJECT_SOURCE_DIR}/data/shell.html -flto -sMAIN_MODULE=1 -sUSE_CLOSURE_COMPILER=0 --closure 0")
+    set_target_properties(hydra PROPERTIES LINK_FLAGS "-sASSERTIONS -sEXPORT_ALL -sEXPORTED_FUNCTIONS=@${CMAKE_CURRENT_SOURCE_DIR}/exported.json -sEXPORTED_RUNTIME_METHODS=ccall -sNO_DISABLE_EXCEPTION_CATCHING -sALLOW_MEMORY_GROWTH -sTOTAL_MEMORY=192MB -lidbfs.js -s ELIMINATE_DUPLICATE_FUNCTIONS=1 --shell-file ${PROJECT_SOURCE_DIR}/data/shell.html -flto -sMAIN_MODULE=1 -sUSE_CLOSURE_COMPILER=0 --closure 0")
 else()
     message(FATAL_ERROR "Unsupported platform")
 endif()

diff --git a/exported.json b/exported.json
@@ -0,0 +1,6 @@
+[
+    "_malloc",
+    "_free",
+    "_main",
+    "_main_impl"
+]
diff --git a/src/app.cxx b/src/app.cxx
@@ -60,15 +60,17 @@ extern "C" void hydra_drop_file(const char* name, void* data, size_t size)
         std::filesystem::path out_path = cores / file;
         std::ofstream ofs(out_path, std::ios_base::binary | std::ios_base::out);
         ofs.write((const char*)data, size);
+        sync_fs();
+        Settings::ReinitCoreInfo();
     }
     else
     {
         std::filesystem::path cache = Settings::GetCachePath();
         std::filesystem::path out_path = cache / file;
         std::ofstream ofs(out_path, std::ios_base::binary | std::ios_base::out);
         ofs.write((const char*)data, size);
+        sync_fs();
     }
-    sync_fs();
 }
 
 #ifdef HYDRA_WEB