From a59c174849bc33520f91a1fecb89fe05f18cdb98 Mon Sep 17 00:00:00 2001
From: Pera Pisar <1405223@gmail.com>
Date: Sun, 21 Apr 2019 22:37:16 +0200
Subject: [PATCH] Reverted previous commit; fixed Ruby version default on Linux

---
 make-oneshot-linux.sh | 2 +-
 mkxp.pro              | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/make-oneshot-linux.sh b/make-oneshot-linux.sh
index 3718c80..d0d520e 100755
--- a/make-oneshot-linux.sh
+++ b/make-oneshot-linux.sh
@@ -23,7 +23,7 @@ echo -e "${white}Compiling ${bold}SyngleChance v${linux_version} ${white}engine
 echo -e "-> ${cyan}Generate makefile...${color_reset}"
 export MRIVERSION=$(echo "puts RUBY_VERSION.split('.').slice(0, 2).join('.')" | ruby)
 export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
-qmake mkxp.pro MRIVERSION=2.3 > oneshot.qmake.out
+qmake mkxp.pro > oneshot.qmake.out
 
 # Compile OneShot.
 echo -e "-> ${cyan}Compile engine...${color_reset}"
diff --git a/mkxp.pro b/mkxp.pro
index d27f202..1b3ce20 100644
--- a/mkxp.pro
+++ b/mkxp.pro
@@ -252,6 +252,12 @@ BINDING_MRI {
 	MRIVERSION = $$(MRIVERSION)
 	isEmpty(MRIVERSION) {
 		MRIVERSION = 2.5
+		unix {
+			!macx {
+				# Issues with compiling on Ubuntu with Ruby 2.4+.
+				MRIVERSION = 2.3
+			}
+		}
 	}
 
 	PKGCONFIG += ruby-$$MRIVERSION