diff --git a/cleanup.sh b/cleanup.sh index 9aed42f..8d9664d 100755 --- a/cleanup.sh +++ b/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 diff --git a/make-oneshot-linux.sh b/make-oneshot-linux.sh index 55176d2..93ea5bc 100755 --- a/make-oneshot-linux.sh +++ b/make-oneshot-linux.sh @@ -22,6 +22,10 @@ echo "-> ${cyan}Generate makefile...${color_reset}" qmake 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 diff --git a/make-oneshot-mac.command b/make-oneshot-mac.command index 3f2aee1..7db0199 100755 --- a/make-oneshot-mac.command +++ b/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 diff --git a/patches/mac/steamshim b/patches/mac/steamshim deleted file mode 100755 index 37c699b..0000000 Binary files a/patches/mac/steamshim and /dev/null differ