Merge branch 'master' into linux

cleanup.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 rm -rf journal/mac/__pycache__
+rm -rf steamshim_parent/steamshim
 rm -rf build
 rm -rf dist
 rm -rf _______.app

make-oneshot-linux.sh

@@ -22,6 +22,10 @@ echo "-> ${cyan}Generate makefile...${color_reset}"
 qmake -qt=5
 echo "-> ${cyan}Compile engine...${color_reset}"
 make -j${make_threads}
+echo "-> ${cyan}Compile steamshim...${color_reset}"
+cd steamshim_parent
+HOST=linux64 make -j${make_threads}
+cd ..
 echo "-> ${cyan}Compile journal...${color_reset}"
 pyinstaller journal/unix/journal.spec --onefile --windowed
 
@@ -42,4 +46,4 @@ rm -rf journal/unix/__pycache__
 rm -rf build
 rm -rf dist
 
-echo "\n${green}Complete!  ${white}Please report any issues to https://github.com/vinyldarkscratch/synglechance/issues${color_reset}"
+echo "\n${green}Complete!  ${white}Please report any issues to https://github.com/GooborgStudios/synglechance/issues${color_reset}"

make-oneshot-mac.command

@@ -22,6 +22,10 @@ echo "-> ${cyan}Generate makefile...${color_reset}"
 qmake MRIVERSION=2.5
 echo "-> ${cyan}Compile engine...${color_reset}"
 make -j${make_threads}
+echo "-> ${cyan}Compile steamshim...${color_reset}"
+cd steamshim_parent
+HOST=osx make -j${make_threads}
+cd ..
 echo "-> ${cyan}Compile journal...${color_reset}"
 pyinstaller journal/unix/journal.spec --onefile --windowed
 
@@ -43,7 +47,7 @@ if [ ! -e $ResourcesDir ]
 	mkdir -p "$ResourcesDir"
 fi
 
-cp patches/mac/steamshim ./OneShot.app/Contents/Resources/steamshim
+cp steamshim_parent/steamshim ./OneShot.app/Contents/Resources/steamshim
 cp patches/mac/libsteam_api.dylib ./OneShot.app/Contents/Libraries/libsteam_api.dylib
 cmake -P patches/mac/CompleteBundle.cmake
 cp assets/icon.icns ./OneShot.app/Contents/Resources/icon.icns
@@ -75,4 +79,4 @@ rm -rf journal/unix/__pycache__
 rm -rf build
 rm -rf dist
 
-echo "\n${green}Complete!  ${white}Please report any issues to https://github.com/vinyldarkscratch/synglechance/issues${color_reset}"
+echo "\n${green}Complete!  ${white}Please report any issues to https://github.com/GooborgStudios/synglechance/issues${color_reset}"