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

Get geode working on macos wine

Browse source
This commit is contained in:
alk 2022-11-19 15:05:10 +03:00 committed by GitHub
parent df14e82fdf
commit 7b9c68567a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
entry.cpp
View file

@ -1,5 +1,4 @@
// included by default in every geode project // included by default in every geode project
#include <Geode/Loader.hpp> #include <Geode/Loader.hpp>
GEODE_API bool GEODE_CALL geode_implicit_load(geode::Mod* m) { GEODE_API bool GEODE_CALL geode_implicit_load(geode::Mod* m) {

5
loader/include/Geode/loader/Loader.hpp
View file

@ -79,8 +79,6 @@ namespace geode {
void updateAllDependencies(); void updateAllDependencies();
void releaseScheduledFunctions(Mod* mod);
friend class Mod; friend class Mod;
friend class CustomLoader; friend class CustomLoader;
friend struct ModInfo; friend struct ModInfo;
@ -93,6 +91,9 @@ namespace geode {
void updateResourcePaths(); void updateResourcePaths();
void updateModResources(Mod* mod); void updateModResources(Mod* mod);
// used internally in geode_implicit_load
void releaseScheduledFunctions(Mod* mod);
friend bool GEODE_CALL ::geode_implicit_load(Mod*); friend bool GEODE_CALL ::geode_implicit_load(Mod*);
public: public:

1
loader/include/Geode/loader/Mod.hpp
View file

@ -331,6 +331,7 @@ namespace geode {
template <class = void> template <class = void>
static inline GEODE_HIDDEN Mod* sharedMod = nullptr; static inline GEODE_HIDDEN Mod* sharedMod = nullptr;
// used internally in geode_implicit_load
template <class = void> template <class = void>
static inline GEODE_HIDDEN void setSharedMod(Mod* mod) { static inline GEODE_HIDDEN void setSharedMod(Mod* mod) {
sharedMod<> = mod; sharedMod<> = mod;

1
loader/src/hooks/MenuLayer.cpp
View file

@ -86,7 +86,6 @@ struct CustomMenuLayer : Modify<CustomMenuLayer, MenuLayer> {
bool init() { bool init() {
if (!MenuLayer::init()) return false; if (!MenuLayer::init()) return false;
// set IDs to everything // set IDs to everything
this->setID("main-menu-layer"); this->setID("main-menu-layer");
setIDSafe(this, 0, "main-menu-bg"); setIDSafe(this, 0, "main-menu-bg");

1
loader/src/internal/InternalMod.cpp
View file

@ -42,6 +42,7 @@ static ModInfo getInternalModInfo() {
InternalMod::InternalMod() : Mod(getInternalModInfo()) { InternalMod::InternalMod() : Mod(getInternalModInfo()) {
m_saveDirPath = Loader::get()->getGeodeSaveDirectory() / GEODE_MOD_DIRECTORY / m_info.m_id; m_saveDirPath = Loader::get()->getGeodeSaveDirectory() / GEODE_MOD_DIRECTORY / m_info.m_id;
ghc::filesystem::create_directories(m_saveDirPath); ghc::filesystem::create_directories(m_saveDirPath);
// make sure spritesheets get added // make sure spritesheets get added

9
loader/src/load/Loader.cpp
View file

@ -426,10 +426,19 @@ ghc::filesystem::path Loader::getGameDirectory() const {
return ghc::filesystem::path(CCFileUtils::sharedFileUtils()->getWritablePath2().c_str()); return ghc::filesystem::path(CCFileUtils::sharedFileUtils()->getWritablePath2().c_str());
} }
#ifdef GEODE_IS_WINDOWS
#include <filesystem>
#endif
ghc::filesystem::path Loader::getSaveDirectory() const { ghc::filesystem::path Loader::getSaveDirectory() const {
// not using ~/Library/Caches // not using ~/Library/Caches
#ifdef GEODE_IS_MACOS #ifdef GEODE_IS_MACOS
return ghc::filesystem::path("/Users/Shared/Geode"); return ghc::filesystem::path("/Users/Shared/Geode");
#elif defined(GEODE_IS_WINDOWS)
return ghc::filesystem::path(
std::filesystem::weakly_canonical(CCFileUtils::sharedFileUtils()->getWritablePath().c_str())
.string()
);
#else #else
return ghc::filesystem::path(CCFileUtils::sharedFileUtils()->getWritablePath().c_str()); return ghc::filesystem::path(CCFileUtils::sharedFileUtils()->getWritablePath().c_str());
#endif #endif

4
loader/src/main.cpp
View file

@ -118,7 +118,9 @@ int geodeEntry(void* platformData) {
"internal tools and Geode can not be loaded. " "internal tools and Geode can not be loaded. "
"(InternalLoader::get returned nullptr)" "(InternalLoader::get returned nullptr)"
); );
return 1;
} }
if (!geode::core::hook::initialize()) { if (!geode::core::hook::initialize()) {
InternalLoader::platformMessageBox( InternalLoader::platformMessageBox(
"Unable to load Geode!", "Unable to load Geode!",
@ -126,7 +128,9 @@ int geodeEntry(void* platformData) {
"internal tools and Geode can not be loaded. " "internal tools and Geode can not be loaded. "
"(Unable to set up hook manager)" "(Unable to set up hook manager)"
); );
return 1;
} }
geode_implicit_load(InternalMod::get()); geode_implicit_load(InternalMod::get());
if (!InternalLoader::get()->setup()) { if (!InternalLoader::get()->setup()) {