7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-03-26 04:39:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

implement warning display to macos bootstrapper

Browse source
This commit is contained in:
altalk23 2022-10-08 13:43:24 +03:00
parent 1b0f87c271
commit 4b685df520
2 changed files with 15 additions and 4 deletions

17
loader/launcher/mac/Bootstrapper.cpp
View file

@ -4,12 +4,21 @@
#include <dlfcn.h>
#include <array>
#include <iostream>
#include <CoreFoundation/CoreFoundation.h>
void displayError(std::string alertMessage) {
CFStringRef cfTitle = CFStringCreateWithCString(NULL, "Geode Bootstrapper", kCFStringEncodingUTF8);
CFStringRef cfMessage = CFStringCreateWithCString(NULL, alertMessage.c_str(), kCFStringEncodingUTF8);
CFUserNotificationDisplayNotice(0, kCFUserNotificationCautionAlertLevel, NULL, NULL, NULL, cfTitle, cfMessage, NULL);
}
void loadGeode() {
auto dylib = dlopen("Geode.dylib", RTLD_LAZY);
if (dylib) return;
std::cout << "Couldn't open Geode: " << dlerror() << std::endl;
displayError(std::string("Couldn't open Geode: ") + dlerror());
return;
}
@ -34,7 +43,7 @@ __attribute__((constructor)) void _entry() {
workingDir / "Geode.dylib", error
);
if (error) {
std::cout << "Couldn't update Geode: " << error.message() << std::endl;
displayError(std::string("Couldn't update Geode: ") + error.message());
return loadGeode();
}
}
@ -43,7 +52,7 @@ __attribute__((constructor)) void _entry() {
ghc::filesystem::remove_all(resourcesDir / "geode.loader", error);
if (error) {
std::cout << "Couldn't update Geode resources: " << error.message() << std::endl;
displayError(std::string("Couldn't update Geode resources: ") + error.message());
return loadGeode();
}
@ -53,7 +62,7 @@ __attribute__((constructor)) void _entry() {
);
if (error) {
std::cout << "Couldn't update Geode resources: " << error.message() << std::endl;
displayError(std::string("Couldn't update Geode resources: ") + error.message());
return loadGeode();
}
}

2
loader/launcher/mac/CMakeLists.txt
View file

@ -8,3 +8,5 @@ set_target_properties(Bootstrapper PROPERTIES
LIBRARY_OUTPUT_DIRECTORY "${GEODE_BIN_PATH}/nightly"
RUNTIME_OUTPUT_DIRECTORY "${GEODE_BIN_PATH}/nightly"
)
target_link_libraries(Bootstrapper PRIVATE "-framework CoreFoundation")