From e0b30f648fabf9b637e33a9c9235c7d7a40f407d Mon Sep 17 00:00:00 2001 From: altalk23 <45172705+altalk23@users.noreply.github.com> Date: Sun, 26 May 2024 14:37:35 +0300 Subject: [PATCH] fix defines --- CMakeLists.txt | 2 +- loader/include/Geode/platform/cplatform.h | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b860a91..584bf9d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -243,7 +243,7 @@ if (DEFINED GEODE_TULIPHOOK_REPO_PATH) message(STATUS "Using ${GEODE_TULIPHOOK_REPO_PATH} for TulipHook") add_subdirectory(${GEODE_TULIPHOOK_REPO_PATH} ${GEODE_TULIPHOOK_REPO_PATH}/build) else() - CPMAddPackage("gh:geode-sdk/TulipHook#40d632d") + CPMAddPackage("gh:geode-sdk/TulipHook#e640d75") endif() set(CMAKE_WARN_DEPRECATED ON CACHE BOOL "" FORCE) diff --git a/loader/include/Geode/platform/cplatform.h b/loader/include/Geode/platform/cplatform.h index 4d3acd0b..c2f5fb51 100644 --- a/loader/include/Geode/platform/cplatform.h +++ b/loader/include/Geode/platform/cplatform.h @@ -19,17 +19,15 @@ #define GEODE_PLATFORM_SHORT_IDENTIFIER "win" #define CC_TARGET_OS_WIN32 - #if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__) - #if defined(WIN64) || defined(_WIN64) || defined(__WIN64) && !defined(__CYGWIN__) - #define GEODE_IS_WINDOWS64 - #define GEODE_WINDOWS64(...) __VA_ARGS__ - #define GEODE_WINDOWS32(...) - #else - #define GEODE_IS_WINDOWS32 - #define GEODE_WINDOWS32(...) __VA_ARGS__ - #define GEODE_WINDOWS64(...) - #endif - #endif + #if defined(WIN64) || defined(_WIN64) || defined(__WIN64) && !defined(__CYGWIN__) + #define GEODE_IS_WINDOWS64 + #define GEODE_WINDOWS64(...) __VA_ARGS__ + #define GEODE_WINDOWS32(...) + #else + #define GEODE_IS_WINDOWS32 + #define GEODE_WINDOWS32(...) __VA_ARGS__ + #define GEODE_WINDOWS64(...) + #endif #else #define GEODE_WINDOWS(...) #endif