From 406f6f9327c4b47a9beab7e9347d8d07ad8ddc69 Mon Sep 17 00:00:00 2001 From: dankmeme01 <42031238+dankmeme01@users.noreply.github.com> Date: Fri, 2 Feb 2024 20:11:55 +0100 Subject: [PATCH] hell yeah --- CMakeLists.txt | 2 +- mod.json | 8 +++++++- src/defs/util.hpp | 9 ++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d448d853..6aaf3e11 100644 --- 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 index f28230f3..ff188034 100644 --- 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" + } + ] } \ No newline at end of file diff --git a/src/defs/util.hpp b/src/defs/util.hpp index 1e690c4a..66645afc 100644 --- a/src/defs/util.hpp +++ b/src/defs/util.hpp @@ -30,7 +30,14 @@ class SingletonBase { #define GLOBED_SINGLETON(cls) public SingletonBase // 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;