fix: fix plugin load failed

IceBlcokMC · Dec 21, 2024 · 4af1470 · 4af1470
1 parent f4bb633
commit 4af1470
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/Entry.cc b/src/Entry.cc
@@ -8,7 +8,7 @@
 #include <thread>
 #include <utility>
 
-#if defined(WIN32) && defined(DEBUG)
+#if (defined(WIN32) || defined(_WIN32)) && defined(DEBUG)
 #include <debugapi.h>
 #endif
 
@@ -20,7 +20,7 @@ Entry* Entry::getInstance() {
 }
 
 void Entry::onLoad() {
-#if defined(WIN32) && defined(DEBUG)
+#if (defined(WIN32) || defined(_WIN32)) && defined(DEBUG)
     getLogger().setLevel(endstone::Logger::Debug);
     getLogger().info("Waiting for VC debugger attach...");
     while (!IsDebuggerPresent()) {
@@ -56,8 +56,10 @@ endstone::PluginDescription const& Entry::getDescription() const { return descri
 
 } // namespace jse
 
-#if defined(_WIN32)
-extern "C" __declspec(dllexport) endstone::Plugin* init_endstone_plugin() { return jse::Entry::getInstance(); }
-else
-extern "C" __attribute__((visibility("default"))) endstone::Plugin* init_endstone_plugin() { return jse::Entry::getInstance(); }
+
+#if defined(WIN32) || defined(_WIN32)
+#define EXPORT_ENTRY_POINT __declspec(dllexport)
+#else
+#define EXPORT_ENTRY_POINT __attribute__((visibility("default")))
 #endif
+extern "C" [[maybe_unused]] EXPORT_ENTRY_POINT endstone::Plugin* init_endstone_plugin() { return jse::Entry::getInstance(); }
diff --git a/third-party/quickjs/linux/lib/quickjs.a b/third-party/quickjs/linux/lib/quickjs.a
diff --git a/xmake.lua b/xmake.lua
@@ -101,9 +101,8 @@ target("Js_Engine")
         )
     elseif is_plat("linux") then
         add_includedirs("./third-party/quickjs/linux/include")
-        add_ldflags("-Wl,--whole-archive ./third-party/quickjs/linux/lib/quickjs.a -Wl,--no-whole-archive", {force = true})
-        add_files("./third-party/quickjs/linux/lib/quickjs.a")
-
+        add_links("third-party/quickjs/linux/lib/quickjs.a")
+
         add_cxflags(
             "-fPIC",
             "-stdlib=libc++",