From cf252b7ba01fb3ff3f2b2dfec1dce3bdc7a32762 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Mon, 4 May 2020 03:52:51 +1000
Subject: [PATCH] Revert "fixes" to EmuHawk.csproj

This reverts the 5 commits ddddb309f through 664fb5cb3.
---
 Dist/copy_assets_and_emuhawk_to_output.bat           |  1 +
 Dist/copy_assets_and_emuhawk_to_output.sh            |  2 ++
 .../BizHawk.Client.EmuHawk.csproj                    | 12 +++++-------
 3 files changed, 8 insertions(+), 7 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 7d7ac0715e..bf1d685db5 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>
@@ -412,6 +411,7 @@
 		<Compile Update="PlatformChooser.cs" SubType="Form" />
 		<Compile Update="PlatformChooser.Designer.cs" DependentUpon="PlatformChooser.cs" />
 		<EmbeddedResource Update="PlatformChooser.resx" DependentUpon="PlatformChooser.cs" />
+		<Compile Update="Properties/Resources.cs" DependentUpon="Resources.resx" />
 		<Compile Update="RomStatusPicker.cs" SubType="Form" />
 		<Compile Update="RomStatusPicker.Designer.cs" DependentUpon="RomStatusPicker.cs" />
 		<EmbeddedResource Update="RomStatusPicker.resx" DependentUpon="RomStatusPicker.cs" />
@@ -634,10 +634,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="PreBuild" AfterTargets="PreBuildEvent">
+		<Exec Command='"$(ProjectDir)..\..\Dist\copy_assets_and_emuhawk_to_output.bat"' Condition=" '$(OS)' == 'Windows_NT' " />
+		<Exec Command='"$(ProjectDir)../../Dist/copy_assets_and_emuhawk_to_output.sh"' Condition=" '$(OS)' != 'Windows_NT' " />
 	</Target>
 </Project>