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

more GGCP

Browse source 
- move Core sources to platform folder
 - make sure source files on Mac include DefaultInclude
 - make sure sources are added in cmake
This commit is contained in:
HJfod 2022-11-28 20:03:30 +02:00
parent d4610df914
commit 02efe58724
11 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
loader/CMakeLists.txt
View file

@ -12,6 +12,7 @@ configure_file(src/internal/about.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/src/interna
# Source files # Source files
file(GLOB SOURCES CONFIGURE_DEPENDS file(GLOB SOURCES CONFIGURE_DEPENDS
src/cocos2d-ext/*.cpp src/cocos2d-ext/*.cpp
src/cocos2d-ext/zip/*.cpp
src/core/*.cpp src/core/*.cpp
src/hooks/*.cpp src/hooks/*.cpp
src/ids/*.cpp src/ids/*.cpp
@ -24,8 +25,6 @@ file(GLOB SOURCES CONFIGURE_DEPENDS
src/mac/*.cpp src/mac/*.cpp
src/main.cpp src/main.cpp
src/utils/*.cpp src/utils/*.cpp
src/utils/windows/*.cpp
src/utils/zip/*.cpp
src/index/*.cpp src/index/*.cpp
src/ui/nodes/*.cpp src/ui/nodes/*.cpp
src/ui/internal/*.cpp src/ui/internal/*.cpp

2
loader/src/core/Core.cpp
View file

@ -5,7 +5,7 @@
#ifndef GEODE_IS_WINDOWS #ifndef GEODE_IS_WINDOWS
#if defined(GEODE_IS_MACOS) #if defined(GEODE_IS_MACOS)
#include "MacOS.hpp" #include "../platform/mac/"
#elif defined(GEODE_IS_IOS) #elif defined(GEODE_IS_IOS)
// #include "iOS.hpp" // #include "iOS.hpp"
#endif #endif

1
loader/src/core/Platform.hpp
View file

@ -1,4 +1,5 @@
#pragma once #pragma once
#include <Geode/platform/platform.hpp> #include <Geode/platform/platform.hpp>
#include <vector> #include <vector>

2
loader/src/platform/ios/util.mm
View file

@ -1,4 +1,6 @@
#include <Geode/DefaultInclude.hpp>
#ifdef GEODE_IS_IOS #ifdef GEODE_IS_IOS
USE_GEODE_NAMESPACE(); USE_GEODE_NAMESPACE();

4
loader/src/core/MacOS.cpp → loader/src/platform/mac/Core.cpp
View file

@ -1,6 +1,8 @@
#include "MacOS.hpp"
#include "Core.hpp" #include "Core.hpp"
#include "../../core/Core.hpp"
#include <Geode/DefaultInclude.hpp>
#ifdef GEODE_IS_MACOS #ifdef GEODE_IS_MACOS

2
loader/src/core/MacOS.hpp → loader/src/platform/mac/Core.hpp
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Platform.hpp" #include "../../core/Platform.hpp"
#include <vector> #include <vector>

2
loader/src/platform/mac/util.mm
View file

@ -1,4 +1,6 @@
#include <Geode/DefaultInclude.hpp>
#ifdef GEODE_IS_MACOS #ifdef GEODE_IS_MACOS
USE_GEODE_NAMESPACE(); USE_GEODE_NAMESPACE();

2
loader/src/core/Windows.cpp → loader/src/platform/windows/Core.cpp
View file

@ -1,6 +1,6 @@
#include "Windows.hpp"
#include "Core.hpp" #include "Core.hpp"
#include "../../core/Core.hpp"
#ifdef GEODE_IS_WINDOWS #ifdef GEODE_IS_WINDOWS

2
loader/src/core/Windows.hpp → loader/src/platform/windows/Core.hpp
View file

@ -1,6 +1,6 @@
#pragma once #pragma once
#include "Platform.hpp" #include "../../core/Platform.hpp"
#include <vector> #include <vector>

5
loader/src/platform/windows/util.cpp
View file

@ -1,11 +1,12 @@
#include <fs/filesystem.hpp>
#include <Geode/DefaultInclude.hpp>
#ifdef GEODE_IS_WINDOWS #ifdef GEODE_IS_WINDOWS
USE_GEODE_NAMESPACE(); USE_GEODE_NAMESPACE();
#include "nfdwin.hpp" #include "nfdwin.hpp"
#include <fs/filesystem.hpp>
#include <Windows.h> #include <Windows.h>
#include <iostream> #include <iostream>
#include <shlwapi.h> #include <shlwapi.h>

12
loader/src/utils/version.cpp
View file

@ -8,21 +8,21 @@
USE_GEODE_NAMESPACE(); USE_GEODE_NAMESPACE();
#ifdef GEODE_IS_WINDOWS #ifdef GEODE_IS_WINDOWS
#define THE_SSCANF sscanf_s #define GEODE_SSCANF sscanf_s
#else #else
#define THE_SSCANF sscanf #define GEODE_SSCANF sscanf
#endif #endif
VersionInfo::VersionInfo(char const* versionString) { VersionInfo::VersionInfo(char const* versionString) {
if (!THE_SSCANF(versionString, "v%d.%d.%d", &this->m_major, &this->m_minor, &this->m_patch)) { if (!GEODE_SSCANF(versionString, "v%d.%d.%d", &this->m_major, &this->m_minor, &this->m_patch)) {
THE_SSCANF(versionString, "%d.%d.%d", &this->m_major, &this->m_minor, &this->m_patch); GEODE_SSCANF(versionString, "%d.%d.%d", &this->m_major, &this->m_minor, &this->m_patch);
} }
} }
bool VersionInfo::validate(std::string const& string) { bool VersionInfo::validate(std::string const& string) {
int buf0, buf1, buf2; int buf0, buf1, buf2;
if (THE_SSCANF(string.c_str(), "v%d.%d.%d", &buf0, &buf1, &buf2)) return true; if (GEODE_SSCANF(string.c_str(), "v%d.%d.%d", &buf0, &buf1, &buf2)) return true;
if (THE_SSCANF(string.c_str(), "%d.%d.%d", &buf0, &buf1, &buf2)) return true; if (GEODE_SSCANF(string.c_str(), "%d.%d.%d", &buf0, &buf1, &buf2)) return true;
return false; return false;
} }