From 245cbfbcea67092ca10570f4f2eb67e8e5146021 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Mon, 4 May 2020 07:21:52 +1000
Subject: [PATCH] This is dumb

This reverts commit d694213000d91f3e010cf16f6b7ede3258a70a39.
---
 Build/copy_assets_and_emuhawk_to_output.bat          | 11 +++++++++++
 Build/copy_assets_and_emuhawk_to_output.sh           |  6 ++++++
 Build/copy_discohawk_to_output.bat                   |  9 +++++++++
 Build/copy_discohawk_to_output.sh                    |  5 +++++
 .../BizHawk.Client.DiscoHawk.csproj                  |  6 +++++-
 .../BizHawk.Client.EmuHawk.csproj                    | 12 ++++--------
 6 files changed, 40 insertions(+), 9 deletions(-)
 create mode 100644 Build/copy_assets_and_emuhawk_to_output.bat
 create mode 100755 Build/copy_assets_and_emuhawk_to_output.sh
 create mode 100644 Build/copy_discohawk_to_output.bat
 create mode 100755 Build/copy_discohawk_to_output.sh

diff --git a/Build/copy_assets_and_emuhawk_to_output.bat b/Build/copy_assets_and_emuhawk_to_output.bat
new file mode 100644
index 0000000000..02d4f2779a
--- /dev/null
+++ b/Build/copy_assets_and_emuhawk_to_output.bat
@@ -0,0 +1,11 @@
+CHDIR "%~dp0\.."
+
+ROBOCOPY /E Assets output
+
+FOR /D %%D IN (src\BizHawk.Client.EmuHawk\bin\*) DO (
+	ROBOCOPY %%D output
+	RENAME output\BizHawk.Client.EmuHawk.exe EmuHawk.exe
+	RENAME output\BizHawk.Client.EmuHawk.exe.config EmuHawk.exe.config
+	goto end
+)
+:end
diff --git a/Build/copy_assets_and_emuhawk_to_output.sh b/Build/copy_assets_and_emuhawk_to_output.sh
new file mode 100755
index 0000000000..15915f9163
--- /dev/null
+++ b/Build/copy_assets_and_emuhawk_to_output.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+cd "$(dirname "$0")/.."
+cp -f -r Assets/* output || printf ""
+cd src/BizHawk.Client.EmuHawk/bin && for d in *; do
+	cp -f $d/* ../../../output && cd ../../../output && mv BizHawk.Client.EmuHawk.exe EmuHawk.exe && mv BizHawk.Client.EmuHawk.exe.config EmuHawk.exe.config && exit 0
+done
diff --git a/Build/copy_discohawk_to_output.bat b/Build/copy_discohawk_to_output.bat
new file mode 100644
index 0000000000..dec5f2981a
--- /dev/null
+++ b/Build/copy_discohawk_to_output.bat
@@ -0,0 +1,9 @@
+CHDIR "%~dp0\.."
+
+FOR /D %%D IN (src\BizHawk.Client.DiscoHawk\bin\*) DO (
+	ROBOCOPY %%D output
+	RENAME output\BizHawk.Client.DiscoHawk.exe DiscoHawk.exe
+	RENAME output\BizHawk.Client.DiscoHawk.exe.config DiscoHawk.exe.config
+	goto end
+)
+:end
diff --git a/Build/copy_discohawk_to_output.sh b/Build/copy_discohawk_to_output.sh
new file mode 100755
index 0000000000..00512028e9
--- /dev/null
+++ b/Build/copy_discohawk_to_output.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+cd "$(dirname "$0")/.."
+cd src/BizHawk.Client.DiscoHawk/bin && for d in *; do
+	cp -f $d/* ../../../output && cd ../../../output && mv BizHawk.Client.DiscoHawk.exe DiscoHawk.exe && mv BizHawk.Client.DiscoHawk.exe.config DiscoHawk.exe.config && exit 0
+done
diff --git a/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj b/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
index 3bec5120da..2296c2fedc 100644
--- a/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
+++ b/src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<ApplicationIcon>discohawk.ico</ApplicationIcon>
 		<DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
-		<OutputPath>$(ProjectDir)../../output</OutputPath>
+		<OutputPath>$(ProjectDir)bin</OutputPath>
 		<OutputType>Exe</OutputType>
 		<TargetFramework>net48</TargetFramework>
 	</PropertyGroup>
@@ -82,4 +82,8 @@
 		<EmbeddedResource Update="MainDiscoForm.resx" DependentUpon="MainDiscoForm.cs" SubType="Designer" />
 -->
 	</ItemGroup>
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+		<Exec Command='"$(ProjectDir)..\..\Build\copy_discohawk_to_output.bat"' Condition=" '$(OS)' == 'Windows_NT' " />
+		<Exec Command='"$(ProjectDir)../../Build/copy_discohawk_to_output.sh"' Condition=" '$(OS)' != 'Windows_NT' " />
+	</Target>
 </Project>
diff --git a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
index c3fd9ce8cd..b5f8bfb18b 100644
--- a/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
+++ b/src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
@@ -5,10 +5,9 @@
 		<ApplicationIcon>images/logo.ico</ApplicationIcon>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<DefineConstants>$(DefineConstants);EXE_PROJECT</DefineConstants>
-		<OutputPath>$(ProjectDir)../../output</OutputPath>
+		<OutputPath>$(ProjectDir)bin</OutputPath>
 		<OutputType>WinExe</OutputType>
 		<TargetFramework>net48</TargetFramework>
-		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 	</PropertyGroup>
 <!--
 	<PropertyGroup>
@@ -413,7 +412,6 @@
 		<Compile Update="PlatformChooser.cs" SubType="Form" />
 		<Compile Update="PlatformChooser.Designer.cs" DependentUpon="PlatformChooser.cs" />
 		<EmbeddedResource Update="PlatformChooser.resx" DependentUpon="PlatformChooser.cs" />
-		
 <!-- creates circular dependency
 		<Compile Update="Properties/Resources.cs" DependentUpon="Resources.resx" />
 -->
@@ -639,10 +637,8 @@
 		<Compile Update="tools/Watch/WatchValueBox.cs" SubType="Component" />
 		<Compile Update="UpdateChecker.cs" SubType="Code" />
 	</ItemGroup>
-	<Target Name="EmuHawkAfterBuild" AfterTargets="Build">
-		<ItemGroup>
-			<AssetFiles Include="$(ProjectDir)../../Assets/**/*.*" Exclude="$(ProjectDir)../../Assets/**/.gitempty;$(ProjectDir)../../Assets/**/.gitignore" />
-		</ItemGroup>
-		<Copy SourceFiles="@(AssetFiles)" DestinationFolder="$(OutputPath)%(RecursiveDir)" SkipUnchangedFiles="true" />
+	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
+		<Exec Command='"$(ProjectDir)..\..\Build\copy_assets_and_emuhawk_to_output.bat"' Condition=" '$(OS)' == 'Windows_NT' " />
+		<Exec Command='"$(ProjectDir)../../Build/copy_assets_and_emuhawk_to_output.sh"' Condition=" '$(OS)' != 'Windows_NT' " />
 	</Target>
 </Project>