mirror of
https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
synced 2026-08-22 23:06:18 +00:00
Update in accordance to #24
This commit is contained in:
parent
a0d4d06e1c
commit
898528f84d
3 changed files with 4 additions and 5 deletions
|
|
@ -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)
|
* [Ancurio's SDL_sound fork](https://github.com/Ancurio/SDL_sound)
|
||||||
* vorbisfile
|
* vorbisfile
|
||||||
* pixman
|
* pixman
|
||||||
* zlib (only ruby bindings)
|
|
||||||
* OpenGL header (alternatively GLES2 with `DEFINES+=GLES2_HEADER`)
|
* 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)
|
* Python 3 (journal reimplementation only)
|
||||||
* PyQt5 for Python 3 (journal reimplementation only)
|
* PyQt5 for Python 3 (journal reimplementation only)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ echo "${white}Compiling ${bold}SyngleChance v${mac_version} ${white}engine for m
|
||||||
|
|
||||||
# Generate makefile and build main + journal
|
# Generate makefile and build main + journal
|
||||||
echo "-> ${cyan}Generate makefile...${color_reset}"
|
echo "-> ${cyan}Generate makefile...${color_reset}"
|
||||||
qmake MRIVERSION=2.3
|
qmake MRIVERSION=2.5
|
||||||
echo "-> ${cyan}Compile engine...${color_reset}"
|
echo "-> ${cyan}Compile engine...${color_reset}"
|
||||||
make -j${make_threads}
|
make -j${make_threads}
|
||||||
echo "-> ${cyan}Compile journal...${color_reset}"
|
echo "-> ${cyan}Compile journal...${color_reset}"
|
||||||
|
|
|
||||||
4
mkxp.pro
4
mkxp.pro
|
|
@ -33,7 +33,7 @@ contains(BINDING, NULL) {
|
||||||
CONFIG += 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 {
|
unix {
|
||||||
CONFIG += c++11
|
CONFIG += c++11
|
||||||
|
|
@ -42,7 +42,7 @@ unix {
|
||||||
macx: {
|
macx: {
|
||||||
INCLUDEPATH += $$QMAKE_MAC_SDK_PATH/System/Library/Frameworks/OpenAL.framework/Versions/A/Headers
|
INCLUDEPATH += $$QMAKE_MAC_SDK_PATH/System/Library/Frameworks/OpenAL.framework/Versions/A/Headers
|
||||||
LIBS += -framework OpenAL -framework AppKit
|
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
|
HEADERS += src/mac-desktop.h
|
||||||
SOURCES += src/mac-desktop.mm
|
SOURCES += src/mac-desktop.mm
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue