Reverted previous commit; fixed Ruby version default on Linux

This commit is contained in:
Pera Pisar 2019-04-21 22:37:16 +02:00
parent e5cb333548
commit a59c174849
No known key found for this signature in database
GPG key ID: 6E1174E4DF875DCA
2 changed files with 7 additions and 1 deletions

View file

@ -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}"

View file

@ -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