From 07423256eac2b595998ed46792c270695c3722d5 Mon Sep 17 00:00:00 2001 From: Vinyl Darkscratch Date: Fri, 6 Jul 2018 12:01:21 -0700 Subject: [PATCH] Compile steamshim --- cleanup.sh | 1 + make-oneshot-linux.sh | 4 ++++ make-oneshot-mac.command | 6 +++++- patches/mac/steamshim | Bin 33400 -> 0 bytes 4 files changed, 10 insertions(+), 1 deletion(-) delete mode 100755 patches/mac/steamshim 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 37c699bfd8e8a321e6b037cfb049d5cc1d0ed810..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33400 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 XW2BHS7h|`IUfv8SW1c}^U;e)Vm>pL^