From cac9b3c17d8c5ba4cae4669d40016ebacee985a6 Mon Sep 17 00:00:00 2001
From: Vinyl Darkscratch <vinyldarkscratch@gmail.com>
Date: Tue, 4 Apr 2017 15:54:22 -0700
Subject: [PATCH] Update make files

Ignore if removing nonexistant files, allow for easy configuration of
thread count, and remove commented configuration removal in QMake file
---
 make-oneshot-mac.sh | 19 ++++++++++---------
 mkxp.pro            |  1 -
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/make-oneshot-mac.sh b/make-oneshot-mac.sh
index 7f6c9a0..a85ecec 100755
--- a/make-oneshot-mac.sh
+++ b/make-oneshot-mac.sh
@@ -4,6 +4,7 @@ set -e
 # User-configurable variables
 mac_version="0.3.3"
 steam_game_dir=~/Library/Application\ Support/Steam/SteamApps/common/OneShot
+make_threads=4
 
 # Colors
 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}"
 qmake MRIVERSION=2.3
 echo "-> ${cyan}Compile engine...${color_reset}"
-make -j4
+make -j${make_threads}
 echo "-> ${cyan}Compile journal...${color_reset}"
 pyinstaller journal/mac/journal.spec --onefile --windowed
 
@@ -31,8 +32,8 @@ cp -r dist/_______.app _______.app
 
 # Set version number
 echo "-> ${cyan}Set version number...${color_reset}"
-rm OneShot.app/Contents/Info.plist
-rm _______.app/Contents/Info.plist
+rm -f OneShot.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/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
 echo "-> ${cyan}Install to Steam directory...${color_reset}"
 cp "${steam_game_dir}/Data/xScripts.rxdata" .
-rm -r "${steam_game_dir}/OneShot.app"
-rm -r "${steam_game_dir}/_______.app"
+rm -rf "${steam_game_dir}/OneShot.app"
+rm -rf "${steam_game_dir}/_______.app"
 cp -r OneShot.app "${steam_game_dir}/OneShot.app"
 cp -r _______.app "${steam_game_dir}/_______.app"
 
 # Cleanup
 echo "-> ${cyan}Cleanup files...${color_reset}"
 # make clean
-rm -r OneShot_new.app
-rm -r journal/mac/__pycache__
-rm -r build
-rm -r dist
+rm -rf OneShot_new.app
+rm -rf journal/mac/__pycache__
+rm -rf build
+rm -rf dist
 
 echo "\n${green}Complete!  ${white}Please report any issues to https://github.com/vinyldarkscratch/mkxp-oneshot/issues${color_reset}"
\ No newline at end of file
diff --git a/mkxp.pro b/mkxp.pro
index 859e605..bb1b04e 100644
--- a/mkxp.pro
+++ b/mkxp.pro
@@ -39,7 +39,6 @@ unix {
 				 sdl2 SDL2_image SDL2_ttf SDL_sound physfs
 	LIBS += -ldl
 	macx: {
-		#CONFIG -= app_bundle
 		INCLUDEPATH += $$QMAKE_MAC_SDK_PATH/System/Library/Frameworks/OpenAL.framework/Versions/A/Headers
 		LIBS += -framework OpenAL
 		QMAKE_LFLAGS += -L/usr/local/opt/ruby@2.3/lib -L/usr/local/opt/openal-soft/lib