update(plugin-loader): Adding again debug

swiftly-solution · Nov 16, 2023 · 0fc217e · 0fc217e
1 parent 48c06c6
commit 0fc217e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -74,8 +74,8 @@
         "regex": "cpp",
         "time.h": "c",
         "cfenv": "cpp",
-        "any": "cpp"
+        "any": "cpp",
+        "filesystem": "cpp"
     },
-    "cmake.sourceDirectory": "C:/Users/SkuZZis/Desktop/CS2 Server/plugins/swiftly/vendor/rapidjson/test/unittest",
     "C_Cpp.default.compilerPath": "C:\\msys64\\mingw64\\bin\\g++.exe"
 }
diff --git a/src/components/Plugins/inc/Plugin.h b/src/components/Plugins/inc/Plugin.h
@@ -7,6 +7,10 @@
 #include <metamod_oslink.h>
 #include <filesystem>
 
+#ifndef _WIN32
+#include <dlfcn.h>
+#endif
+
 const std::string funcsToLoad[] = {
     "RegisterPlayer",
     "OnProgramLoad",
@@ -54,7 +58,12 @@ class Plugin
 
     void LoadPlugin()
     {
-        this->m_hModule = dlmount(WIN_LINUX(this->m_path.c_str(), string_format("%s/%s", std::filesystem::current_path().string().c_str(), this->m_path.c_str()).c_str()));
+#ifdef _WIN32
+        this->m_hModule = dlmount(this->m_path.c_str());
+#else
+        this->m_hModule = dlopen(string_format("%s/%s", std::filesystem::current_path().string().c_str(), this->m_path.c_str()).c_str(), RTLD_LAZY);
+#endif
+        PRINT("LoadPlugin", string_format("%s/%s\nhModule addr: %p\n", std::filesystem::current_path().string().c_str(), this->m_path.c_str(), this->m_hModule).c_str());
 
         for (uint16 i = 0; i < ARR_SIZE(funcsToLoad); i++)
             this->RegisterFunction("Internal_" + funcsToLoad[i]);