hell yeah

GlobedGD · Feb 2, 2024 · 406f6f9 · 406f6f9
1 parent bb96d56
commit 406f6f9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -28,7 +28,7 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     add_definitions(/FI"WinSock2.h")
 endif()
 
-if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     add_compile_options("-Wno-inaccessible-base")
     add_compile_options("-Wno-pointer-sign")
 

diff --git a/mod.json b/mod.json
@@ -10,5 +10,11 @@
     "name": "Globed",
     "developer": "dankmeme",
     "description": "Feature-rich multiplayer mod for Geometry Dash",
-    "dependencies": []
+    "dependencies": [
+        {
+            "id": "geode.custom-keybinds",
+            "version": ">=v1.2.3",
+            "importance": "required"
+        }
+    ]
 }
diff --git a/src/defs/util.hpp b/src/defs/util.hpp
@@ -30,7 +30,14 @@ class SingletonBase {
 #define GLOBED_SINGLETON(cls) public SingletonBase<cls>
 
 // using decls to avoid polluting the namespace in headers
-namespace log = geode::log;
+
+// ugly workaround because MSVC sucks ass
+namespace __globed_log_namespace_shut_up_msvc {
+    namespace log = geode::log;
+}
+
+using namespace __globed_log_namespace_shut_up_msvc;
+
 using geode::Result;
 using geode::Loader;
 using geode::Mod;