debug maybe works now, and other things

This commit is contained in:
matcool 2024-01-09 16:59:57 -03:00
parent 8081860055
commit 7ba832c9ee
6 changed files with 15 additions and 9 deletions

View file

@ -86,6 +86,11 @@ endif()
target_compile_definitions(${PROJECT_NAME} INTERFACE GEODE_GD_VERSION=${GEODE_GD_VERSION})
if (WIN32)
# This allows you to compile in debug mode
add_compile_definitions(_HAS_ITERATOR_DEBUGGING=0)
add_definitions(-D_HAS_ITERATOR_DEBUGGING=0)
endif()
set(MAT_JSON_AS_INTERFACE ON)
CPMAddPackage("gh:geode-sdk/json#49bdff7")
@ -260,11 +265,6 @@ else()
set(GEODE_PLATFORM_BIN_PATH ${GEODE_BIN_PATH}/${PROJECT_VERSION}/${GEODE_PLATFORM_BINARY})
endif()
if (WIN32)
# This allows you to compile in debug mode
add_compile_definitions(_HAS_ITERATOR_DEBUGGING=0)
endif()
if (PROJECT_IS_TOP_LEVEL)
add_subdirectory(loader)

View file

@ -82,6 +82,12 @@ file(GLOB OBJC_SOURCES
)
set_source_files_properties(${OBJC_SOURCES} PROPERTIES SKIP_PRECOMPILE_HEADERS ON)
if (WIN32)
# This allows you to compile in debug mode
add_compile_definitions(_HAS_ITERATOR_DEBUGGING=0)
add_definitions(-D_HAS_ITERATOR_DEBUGGING=0)
endif()
# Add platform sources
if (WIN32)
@ -201,6 +207,7 @@ if (NOT GEODE_BUILDING_DOCS)
# Zip support (needed for in-memory streams, which zlib's minizip doesn't support)
set(MZ_LZMA Off CACHE INTERNAL "Enables LZMA & XZ compression")
set(MZ_ZSTD Off CACHE INTERNAL "")
set(MZ_BZIP2 Off CACHE INTERNAL "")
set(MZ_OPENSSL Off CACHE INTERNAL "")
set(MZ_LIBBSD Off CACHE INTERNAL "")
set(CMAKE_WARN_DEPRECATED OFF CACHE BOOL "" FORCE)

View file

@ -17,8 +17,6 @@
#include <type_traits>
#include <unordered_map>
namespace geode::core::meta {}
#define CLASSPARAM(...)
#define STRUCTPARAM(...)

View file

@ -1,6 +1,7 @@
#pragma once
#include "../loader/Event.hpp"
#include <optional>
namespace cocos2d {
class CCNode;

Binary file not shown.

View file

@ -1,7 +1,7 @@
using namespace geode::prelude;
#include <Geode/modify/CCTouchDispatcher.hpp>
using namespace geode::prelude;
struct ForcePrioRevert : Modify<ForcePrioRevert, CCTouchDispatcher> {
void addTargetedDelegate(CCTouchDelegate* delegate, int priority, bool swallowsTouches) {
m_targetPrio = 0xb00b5; // fuck you windows i hate you for inlining isUsingForcePrio