mirror of
https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
synced 2026-08-19 13:29:54 +00:00
Reverted previous commit; fixed Ruby version default on Linux
This commit is contained in:
parent
e5cb333548
commit
a59c174849
2 changed files with 7 additions and 1 deletions
|
|
@ -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}"
|
||||
|
|
|
|||
6
mkxp.pro
6
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
|
||||
|
|
|
|||
Loading…
Reference in a new issue