ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "fixes" to EmuHawk.csproj 

This reverts the 5 commits ddddb309f through 664fb5cb3.
This commit is contained in:
YoshiRulz 2020-05-04 03:52:51 +10:00
parent 588eeeca27
commit cf252b7ba0
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Dist/copy_assets_and_emuhawk_to_output.bat Normal file
View File

@ -0,0 +1 @@
REM TODO

2
Dist/copy_assets_and_emuhawk_to_output.sh Executable file
View File

@ -0,0 +1,2 @@
#!/bin/sh
cd "$(dirname "$0")/.." && (cp -r Assets/* output; cp src/BizHawk.Client.EmuHawk/bin/*/* output)

12
src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -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>