From 898528f84d6e5a899bb73e6ee5d8ae732fd16288 Mon Sep 17 00:00:00 2001 From: Vinyl Darkscratch Date: Wed, 21 Mar 2018 00:55:23 -0700 Subject: [PATCH] Update in accordance to #24 --- README.md | 3 +-- make-oneshot-mac.command | 2 +- mkxp.pro | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e4b9948..c78595d 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,8 @@ Thanks to [hunternet93](https://github.com/hunternet93) for starting the reimple * [Ancurio's SDL_sound fork](https://github.com/Ancurio/SDL_sound) * vorbisfile * pixman -* zlib (only ruby bindings) * OpenGL header (alternatively GLES2 with `DEFINES+=GLES2_HEADER`) -* Ruby (make sure to use 2.3 on macOS due to a save formatting bug in newer versions -- @Yummychickenblue reports this may not be an issue anymore) +* Ruby * Python 3 (journal reimplementation only) * PyQt5 for Python 3 (journal reimplementation only) diff --git a/make-oneshot-mac.command b/make-oneshot-mac.command index f6b4ac1..693979e 100755 --- a/make-oneshot-mac.command +++ b/make-oneshot-mac.command @@ -19,7 +19,7 @@ echo "${white}Compiling ${bold}SyngleChance v${mac_version} ${white}engine for m # Generate makefile and build main + journal echo "-> ${cyan}Generate makefile...${color_reset}" -qmake MRIVERSION=2.3 +qmake MRIVERSION=2.5 echo "-> ${cyan}Compile engine...${color_reset}" make -j${make_threads} echo "-> ${cyan}Compile journal...${color_reset}" diff --git a/mkxp.pro b/mkxp.pro index 2bac4bf..11cab11 100644 --- a/mkxp.pro +++ b/mkxp.pro @@ -33,7 +33,7 @@ contains(BINDING, NULL) { CONFIG += BINDING_NULL } -PKGCONFIG = sigc++-2.0 pixman-1 zlib sdl2 SDL2_image SDL2_ttf openal SDL_sound vorbisfile +PKGCONFIG = sigc++-2.0 pixman-1 zlib sdl2 SDL2_image SDL2_ttf openal SDL_sound vorbisfile unix { CONFIG += c++11 @@ -42,7 +42,7 @@ unix { macx: { INCLUDEPATH += $$QMAKE_MAC_SDK_PATH/System/Library/Frameworks/OpenAL.framework/Versions/A/Headers LIBS += -framework OpenAL -framework AppKit - QMAKE_LFLAGS += -L/usr/local/opt/ruby@2.3/lib -L/usr/local/opt/openal-soft/lib + QMAKE_LFLAGS += -L/usr/local/opt/ruby/lib -L/usr/local/opt/openal-soft/lib HEADERS += src/mac-desktop.h SOURCES += src/mac-desktop.mm }