From 93de7fbba6b8f48ca541ca9dd8bf7e4f7a696b0f Mon Sep 17 00:00:00 2001 From: mathusummut Date: Mon, 5 Nov 2018 22:54:44 +0100 Subject: [PATCH] Added Ubuntu 18 support --- mk/linux/build-zg-nodeps.sh | 2 +- mk/linux/zetaglest.sh | 6 ------ source/glest_game/main/main.cpp | 2 ++ 3 files changed, 3 insertions(+), 7 deletions(-) delete mode 100755 mk/linux/zetaglest.sh diff --git a/mk/linux/build-zg-nodeps.sh b/mk/linux/build-zg-nodeps.sh index 64b70f54d..4cf7beebb 100755 --- a/mk/linux/build-zg-nodeps.sh +++ b/mk/linux/build-zg-nodeps.sh @@ -323,5 +323,5 @@ else echo 'BUILD COMPLETE.' echo '' echo 'To launch ZetaGlest from the current directory, use:' - echo ' ./zetaglest.sh' + echo ' ./build/zetaglest' fi diff --git a/mk/linux/zetaglest.sh b/mk/linux/zetaglest.sh deleted file mode 100755 index 7ede0b823..000000000 --- a/mk/linux/zetaglest.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -export DBUS_FATAL_WARNINGS=0 -unset XMODIFIERS -cd build -./zetaglest -cd .. diff --git a/source/glest_game/main/main.cpp b/source/glest_game/main/main.cpp index 224566d9c..499baf857 100644 --- a/source/glest_game/main/main.cpp +++ b/source/glest_game/main/main.cpp @@ -8428,6 +8428,8 @@ namespace Game { } //end namespace int main(int argc, char **argv) { + setenv("DBUS_FATAL_WARNINGS", "0", 1); + unsetenv("XMODIFIERS"); int result = mainSetup(argc,argv); if (result == 0) result = Game::glestMainWrapper(argc, argv);