snxrzx
/
mkxp-sunshine
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update make files 

Ignore if removing nonexistant files, allow for easy configuration of
thread count, and remove commented configuration removal in QMake file
This commit is contained in:
Vinyl Darkscratch 2017-04-04 15:54:22 -07:00
parent d4a22f2b81
commit cac9b3c17d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
make-oneshot-mac.sh
View File

@ -4,6 +4,7 @@ set -e
# User-configurable variables # User-configurable variables
mac_version="0.3.3" mac_version="0.3.3"
steam_game_dir=~/Library/Application\ Support/Steam/SteamApps/common/OneShot steam_game_dir=~/Library/Application\ Support/Steam/SteamApps/common/OneShot
make_threads=4
# Colors # Colors
white="\033[0;37m" # White - Regular white="\033[0;37m" # White - Regular
@ -18,7 +19,7 @@ echo "${white}Compiling ${bold}SyngleChance v${mac_version} ${white}engine for m
echo "-> ${cyan}Generate makefile...${color_reset}" echo "-> ${cyan}Generate makefile...${color_reset}"
qmake MRIVERSION=2.3 qmake MRIVERSION=2.3
echo "-> ${cyan}Compile engine...${color_reset}" echo "-> ${cyan}Compile engine...${color_reset}"
make -j4 make -j${make_threads}
echo "-> ${cyan}Compile journal...${color_reset}" echo "-> ${cyan}Compile journal...${color_reset}"
pyinstaller journal/mac/journal.spec --onefile --windowed pyinstaller journal/mac/journal.spec --onefile --windowed
@ -31,8 +32,8 @@ cp -r dist/_______.app _______.app
# Set version number # Set version number
echo "-> ${cyan}Set version number...${color_reset}" echo "-> ${cyan}Set version number...${color_reset}"
rm OneShot.app/Contents/Info.plist rm -f OneShot.app/Contents/Info.plist
rm _______.app/Contents/Info.plist rm -f _______.app/Contents/Info.plist
m4 patches/mac/Info.plist.in -DONESHOTMACVERSION=$mac_version > OneShot.app/Contents/Info.plist m4 patches/mac/Info.plist.in -DONESHOTMACVERSION=$mac_version > OneShot.app/Contents/Info.plist
m4 patches/mac/JournalInfo.plist.in -DONESHOTMACVERSION=$mac_version > _______.app/Contents/Info.plist m4 patches/mac/JournalInfo.plist.in -DONESHOTMACVERSION=$mac_version > _______.app/Contents/Info.plist
@ -43,17 +44,17 @@ ruby rpgscript.rb ./scripts "${steam_game_dir}"
# Install to Steam directory # Install to Steam directory
echo "-> ${cyan}Install to Steam directory...${color_reset}" echo "-> ${cyan}Install to Steam directory...${color_reset}"
cp "${steam_game_dir}/Data/xScripts.rxdata" . cp "${steam_game_dir}/Data/xScripts.rxdata" .
rm -r "${steam_game_dir}/OneShot.app" rm -rf "${steam_game_dir}/OneShot.app"
rm -r "${steam_game_dir}/_______.app" rm -rf "${steam_game_dir}/_______.app"
cp -r OneShot.app "${steam_game_dir}/OneShot.app" cp -r OneShot.app "${steam_game_dir}/OneShot.app"
cp -r _______.app "${steam_game_dir}/_______.app" cp -r _______.app "${steam_game_dir}/_______.app"
# Cleanup # Cleanup
echo "-> ${cyan}Cleanup files...${color_reset}" echo "-> ${cyan}Cleanup files...${color_reset}"
# make clean # make clean
rm -r OneShot_new.app rm -rf OneShot_new.app
rm -r journal/mac/__pycache__ rm -rf journal/mac/__pycache__
rm -r build rm -rf build
rm -r dist rm -rf dist
echo "\n${green}Complete! ${white}Please report any issues to https://github.com/vinyldarkscratch/mkxp-oneshot/issues${color_reset}" echo "\n${green}Complete! ${white}Please report any issues to https://github.com/vinyldarkscratch/mkxp-oneshot/issues${color_reset}"

1
mkxp.pro
View File

@ -39,7 +39,6 @@ unix {
sdl2 SDL2_image SDL2_ttf SDL_sound physfs sdl2 SDL2_image SDL2_ttf SDL_sound physfs
LIBS += -ldl LIBS += -ldl
macx: { macx: {
#CONFIG -= app_bundle
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 LIBS += -framework OpenAL
QMAKE_LFLAGS += -L/usr/local/opt/ruby@2.3/lib -L/usr/local/opt/openal-soft/lib QMAKE_LFLAGS += -L/usr/local/opt/ruby@2.3/lib -L/usr/local/opt/openal-soft/lib