gamer4life1/minecraft-pi-docker
1
0
Fork 0
forked from minecraft-pi-reborn/minecraft-pi-reborn
Code Issues Pull Requests Releases Wiki Activity

Fix For ARMHF

Browse Source
This commit is contained in:
TheBrokenRail 2022-10-01 19:29:11 -04:00
parent 95345a5f1b
commit 57b0bce12c
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -48,7 +48,8 @@ endif()
set(MCPI_APP_ID "${DEFAULT_APP_ID}" CACHE STRING "App ID") set(MCPI_APP_ID "${DEFAULT_APP_ID}" CACHE STRING "App ID")
# App Title # App Title
set(DEFAULT_APP_TITLE "Minecraft: Pi Edition: Reborn") set(MCPI_APP_BASE_TITLE "Minecraft: Pi Edition: Reborn" CACHE STRING "Base App Title")
set(DEFAULT_APP_TITLE "${MCPI_APP_BASE_TITLE}")
if(MCPI_SERVER_MODE) if(MCPI_SERVER_MODE)
string(APPEND DEFAULT_APP_TITLE " (Server)") string(APPEND DEFAULT_APP_TITLE " (Server)")
else() else()

2
launcher/src/crash-report.c
View File

@ -31,7 +31,7 @@ static void show_report(const char *log_filename) {
"--width", CRASH_REPORT_DIALOG_WIDTH, "--width", CRASH_REPORT_DIALOG_WIDTH,
"--height", CRASH_REPORT_DIALOG_HEIGHT, "--height", CRASH_REPORT_DIALOG_HEIGHT,
"--text-info", "--text-info",
"--text", "Minecraft: Pi Edition: Reborn has crashed!\n\nNeed help? Consider asking on the <a href=\"https://discord.com/invite/aDqejQGMMy\">Discord server</a>! <i>If you believe this is a problem with Minecraft: Pi Edition: Reborn itself, please upload this crash report to the #bugs Discord channel.</i>", "--text", MCPI_APP_BASE_TITLE " has crashed!\n\nNeed help? Consider asking on the <a href=\"https://discord.com/invite/aDqejQGMMy\">Discord server</a>! <i>If you believe this is a problem with " MCPI_APP_BASE_TITLE " itself, please upload this crash report to the #bugs Discord channel.</i>",
"--filename", log_filename, "--filename", log_filename,
"--no-wrap", "--no-wrap",
"--font", "Monospace", "--font", "Monospace",

2
launcher/src/patchelf.cpp
View File

@ -75,7 +75,7 @@ static int dl_iterate_callback(struct dl_phdr_info *info, __attribute__((unused)
for (int i = 0; i < info->dlpi_phnum; i++) { for (int i = 0; i < info->dlpi_phnum; i++) {
if (info->dlpi_phdr[i].p_type == PT_INTERP) { if (info->dlpi_phdr[i].p_type == PT_INTERP) {
// Callback // Callback
*(char **) data = (char *) info->dlpi_phdr[i].p_vaddr; *(char **) data = (char *) (info->dlpi_addr + info->dlpi_phdr[i].p_vaddr);
} }
} }
} }

1
libreborn/include/libreborn/config.h.in
View File

@ -5,6 +5,7 @@
#cmakedefine MCPI_IS_APPIMAGE_BUILD #cmakedefine MCPI_IS_APPIMAGE_BUILD
#cmakedefine MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN #cmakedefine MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN
#cmakedefine MCPI_USE_GLES1_COMPATIBILITY_LAYER #cmakedefine MCPI_USE_GLES1_COMPATIBILITY_LAYER
#cmakedefine MCPI_APP_BASE_TITLE "@MCPI_APP_BASE_TITLE@"
#cmakedefine MCPI_APP_TITLE "@MCPI_APP_TITLE@" #cmakedefine MCPI_APP_TITLE "@MCPI_APP_TITLE@"
#cmakedefine MCPI_APP_ID "@MCPI_APP_ID@" #cmakedefine MCPI_APP_ID "@MCPI_APP_ID@"
#cmakedefine MCPI_VERSION "@MCPI_VERSION@" #cmakedefine MCPI_VERSION "@MCPI_VERSION@"

4
media-layer/core/src/media.c
View File

@ -18,8 +18,10 @@
#endif #endif
// Allow Disabling Interaction // Allow Disabling Interaction
static void emit_events_after_is_interactable_change();
static void update_cursor(); static void update_cursor();
#ifndef MCPI_HEADLESS_MODE
static void emit_events_after_is_interactable_change();
#endif
static int is_interactable = 1; static int is_interactable = 1;
void media_set_interactable(int toggle) { void media_set_interactable(int toggle) {
if (toggle != is_interactable) { if (toggle != is_interactable) {