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

Add 2.204 support (#422)

Browse source
This commit is contained in:
Cvolton 2024-01-17 18:09:08 +01:00 committed by GitHub
parent 4d2b676d48
commit e23b051a3d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -78,7 +78,7 @@ include(cmake/CPM.cmake)
if (NOT DEFINED GEODE_GD_VERSION)
if (${GEODE_TARGET_PLATFORM} STREQUAL "Win32")
set(GEODE_GD_VERSION 2.203)
set(GEODE_GD_VERSION 2.204)
else()
set(GEODE_GD_VERSION 2.200)
endif()

2
loader/include/Geode/cocos/platform/win32/CCApplication.h vendored
View file

@ -97,6 +97,7 @@ public:
gd::string m_resourceRootPath;
gd::string m_startupScriptFilename;
CCControllerHandler* m_pControllerHandler;
void* m_unk; //might be swapped with m_pControllerHandler
bool m_bUpdateController;
CC_SYNTHESIZE_NV(bool, m_bShutdownCalled, ShutdownCalled);
INPUT m_iInput;
@ -111,6 +112,7 @@ public:
CC_SYNTHESIZE_NV(bool, m_bForceTimer, ForceTimer);
CC_SYNTHESIZE_NV(bool, m_bSmoothFix, SmoothFix);
CC_SYNTHESIZE_NV(bool, m_bFullscreen, Fullscreen);
CC_SYNTHESIZE_NV(bool, m_bBorderless, Borderless);
static CCApplication * sm_pSharedApplication;
};

11
loader/include/Geode/cocos/platform/win32/CCEGLView.h vendored
View file

@ -121,8 +121,8 @@ public:
*/
static CCEGLView* create(const gd::string&);
static cocos2d::CCEGLView* createWithFullScreen(gd::string const&);
static cocos2d::CCEGLView* createWithFullScreen(gd::string const&, GLFWvidmode const&, GLFWmonitor*);
static cocos2d::CCEGLView* createWithFullScreen(gd::string const&, bool);
static cocos2d::CCEGLView* createWithFullScreen(gd::string const&, bool, GLFWvidmode const&, GLFWmonitor*);
static cocos2d::CCEGLView* createWithRect(gd::string const&, cocos2d::CCRect, float);
/**
@ -133,7 +133,7 @@ public:
/**
* @note RobTop addition
*/
void toggleFullScreen(bool fullscreen);
void toggleFullScreen(bool fullscreen, bool borderless);
/**
* @note RobTop addition
@ -152,13 +152,14 @@ public:
bool getCursorLocked() const;
bool getGameplayActive() const;
bool getIsBorderless() const;
bool getIsFullscreen() const;
int getRetinaFactor() const;
bool getShouldHideCursor() const;
void iconify();
bool initWithFullScreen(gd::string const&);
bool initWithFullscreen(gd::string const&, GLFWvidmode const&, GLFWmonitor*);
bool initWithFullScreen(gd::string const&, bool);
bool initWithFullscreen(gd::string const&, bool, GLFWvidmode const&, GLFWmonitor*);
bool initWithRect(gd::string const&, cocos2d::CCRect, float);
bool isRetinaEnabled() const;

BIN
loader/include/link/gdstring.lib
View file

Binary file not shown.

BIN
loader/include/link/libcocos2d.lib
View file

Binary file not shown.

3
loader/src/platform/windows/gdTimestampMap.hpp
View file

@ -29,7 +29,8 @@ static auto const& getGDVersionTimestampMap() {
{ 1702921605, "2.200" },
{ 1704582672, "2.201" },
{ 1704601266, "2.202" },
{ 1704948277, "2.203" }
{ 1704948277, "2.203" },
{ 1705041028, "2.204" },
};
return map;
}