7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-14 19:15:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

define NOMINMAX

Browse source
This commit is contained in:
matcool 2022-12-12 21:30:15 -03:00
parent 5cd199e264
commit 25fcc35dad
No known key found for this signature in database
GPG key ID: BF58756086D7AB1C
6 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/Platform.cmake
View file

@ -58,7 +58,7 @@ elseif (GEODE_TARGET_PLATFORM STREQUAL "Win32")
${GEODE_LOADER_PATH}/include/Geode/cocos/cocos2dx/platform/third_party/win32/OGLES
)
target_compile_definitions(${PROJECT_NAME} INTERFACE -DCC_TARGET_OS_WIN32)
target_compile_definitions(${PROJECT_NAME} INTERFACE -DCC_TARGET_OS_WIN32 NOMINMAX)
target_link_libraries(${PROJECT_NAME} INTERFACE
${GEODE_LOADER_PATH}/include/link/libcocos2d.lib

2
loader/include/Geode/utils/general.hpp
View file

@ -10,8 +10,6 @@
#include <vector>
#include <ghc/filesystem.hpp>
#undef snprintf
// for some reason std::filesystem::path doesn't have std::hash defined in C++17
// and ghc seems to have inherited this limitation
template<>

3
loader/include/Geode/utils/ranges.hpp
View file

@ -7,9 +7,6 @@
#include <optional>
#include <iterator>
#undef min
#undef max
#ifndef __cpp_lib_concepts
namespace std {
// <concepts> isn't working for me lmao

4
loader/src/ui/internal/info/ModInfoPopup.cpp
View file

@ -23,10 +23,6 @@
#include <Geode/utils/web.hpp>
#include <loader/LoaderImpl.hpp>
// TODO: die
#undef min
#undef max
static constexpr int const TAG_CONFIRM_UNINSTALL = 5;
static constexpr int const TAG_DELETE_SAVEDATA = 6;
static const CCSize LAYER_SIZE = {440.f, 290.f};

4
loader/src/ui/nodes/Scrollbar.cpp
View file

@ -1,10 +1,6 @@
#include <Geode/ui/Scrollbar.hpp>
#include <Geode/utils/cocos.hpp>
// TODO: die
#undef min
#undef max
USE_GEODE_NAMESPACE();
bool Scrollbar::ccTouchBegan(CCTouch* touch, CCEvent* event) {

2
loader/src/ui/nodes/TextRenderer.cpp
View file

@ -2,8 +2,6 @@
#include <Geode/utils/casts.hpp>
#include <Geode/utils/cocos.hpp>
#include <Geode/utils/string.hpp>
#undef max
#undef min
USE_GEODE_NAMESPACE();
using namespace std::string_literals;