From 0ff90bf13132188f0a6170b573604d0e380b0657 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sun, 3 May 2020 13:19:00 +1000 Subject: [PATCH] Migrate EmuHawk's post-build targets to shell scripts (because MSBuild's doesn't want to co-operate) fixes 2bf1dfbd0, but the batch script is empty so build is still technically broken on Windows --- Dist/copy_assets_and_emuhawk_to_output.bat | 1 + Dist/copy_assets_and_emuhawk_to_output.sh | 2 ++ .../BizHawk.Client.EmuHawk.csproj | 10 ++++------ 3 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 Dist/copy_assets_and_emuhawk_to_output.bat create mode 100755 Dist/copy_assets_and_emuhawk_to_output.sh diff --git a/Dist/copy_assets_and_emuhawk_to_output.bat b/Dist/copy_assets_and_emuhawk_to_output.bat new file mode 100644 index 0000000000..4c92412abc --- /dev/null +++ b/Dist/copy_assets_and_emuhawk_to_output.bat @@ -0,0 +1 @@ +REM TODO diff --git a/Dist/copy_assets_and_emuhawk_to_output.sh b/Dist/copy_assets_and_emuhawk_to_output.sh new file mode 100755 index 0000000000..d45a002b69 --- /dev/null +++ b/Dist/copy_assets_and_emuhawk_to_output.sh @@ -0,0 +1,2 @@ +#!/bin/sh +cd "$(dirname "$0")/.." && (cp -r Assets/* output; cp src/BizHawk.Client.EmuHawk/bin/*/* output) diff --git a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj index 8ba01fbebb..bf1d685db5 100644 --- a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj +++ b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj @@ -5,7 +5,7 @@ images/logo.ico app.manifest $(DefineConstants);EXE_PROJECT - $(ProjectDir)../../output + $(ProjectDir)bin WinExe net48 @@ -634,10 +634,8 @@ - - - - - + + +