diff --git a/dependencies/zenity/src b/dependencies/zenity/src index 633e00f..d673e9a 160000 --- a/dependencies/zenity/src +++ b/dependencies/zenity/src @@ -1 +1 @@ -Subproject commit 633e00f277ff6996e2c6d5b746f7a372e7a4b4a2 +Subproject commit d673e9aab842d7151d92eb9164872dc05e748db2 diff --git a/launcher/src/bootstrap.c b/launcher/src/bootstrap.c index 96deb4b..020d785 100644 --- a/launcher/src/bootstrap.c +++ b/launcher/src/bootstrap.c @@ -151,10 +151,18 @@ static void exit_handler(__attribute__((unused)) int signal_id) { // Pre-Bootstrap void pre_bootstrap() { // GTK Dark Mode -#ifndef MCPI_HEADLESS_MODE +#ifndef MCPI_SERVER_MODE set_and_print_env("GTK_THEME", "Adwaita:dark"); #endif + // Debug Zenity + { + const char *is_debug = getenv("MCPI_DEBUG"); + if (is_debug != NULL && strlen(is_debug) > 0) { + set_and_print_env("ZENITY_DEBUG", "1"); + } + } + // AppImage #ifdef MCPI_IS_APPIMAGE_BUILD { diff --git a/libreborn/src/util/exec.c b/libreborn/src/util/exec.c index fd3d651..920d898 100644 --- a/libreborn/src/util/exec.c +++ b/libreborn/src/util/exec.c @@ -77,14 +77,6 @@ char *run_command(const char *const command[], int *return_code) { close(output_pipe[0]); close(output_pipe[1]); - // Close stderr (But Not In Debug Mode) - const char *is_debug = getenv("MCPI_DEBUG"); - if (is_debug == NULL || strlen(is_debug) < 1) { - int null_fd = open("/dev/null", O_WRONLY); - dup2(null_fd, STDERR_FILENO); - close(null_fd); - } - // Run safe_execvpe(command, (const char *const *) environ); } else { diff --git a/mods/CMakeLists.txt b/mods/CMakeLists.txt index bd2cb27..7bc0546 100644 --- a/mods/CMakeLists.txt +++ b/mods/CMakeLists.txt @@ -1,10 +1,5 @@ project(mods) -## Setup - -# Disable C++11 String ABI -add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) - ## Mods add_library(compat SHARED src/compat/compat.c src/compat/egl.c src/compat/x11.c src/compat/bcm_host.c) diff --git a/symbols/CMakeLists.txt b/symbols/CMakeLists.txt index cfa9dc5..89bb94a 100644 --- a/symbols/CMakeLists.txt +++ b/symbols/CMakeLists.txt @@ -2,3 +2,6 @@ project(symbols) add_library(symbols INTERFACE) target_include_directories(symbols INTERFACE include) + +# Disable C++11 String ABI +target_compile_definitions(symbols INTERFACE -D_GLIBCXX_USE_CXX11_ABI=0)