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

Revert "Revert "fixes" to EmuHawk.csproj" 

This reverts commit cf252b7ba0.
This commit is contained in:
zeromus 2020-05-03 17:04:44 -04:00
parent bdd622681d
commit d694213000
6 changed files with 9 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Build/copy_assets_and_emuhawk_to_output.bat
View File

@ -1,11 +0,0 @@
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

6
Build/copy_assets_and_emuhawk_to_output.sh
View File

@ -1,6 +0,0 @@
#!/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

9
Build/copy_discohawk_to_output.bat
View File

@ -1,9 +0,0 @@
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

5
Build/copy_discohawk_to_output.sh
View File

@ -1,5 +0,0 @@
#!/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

6
src/BizHawk.Client.DiscoHawk/BizHawk.Client.DiscoHawk.csproj
View File

@ -3,7 +3,7 @@
<PropertyGroup>
<ApplicationIcon>discohawk.ico</ApplicationIcon>
<DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
<OutputPath>$(ProjectDir)bin</OutputPath>
<OutputPath>$(ProjectDir)../../output</OutputPath>
<OutputType>Exe</OutputType>
<TargetFramework>net48</TargetFramework>
</PropertyGroup>
@ -82,8 +82,4 @@
<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>

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

@ -5,9 +5,10 @@
<ApplicationIcon>images/logo.ico</ApplicationIcon>
<ApplicationManifest>app.manifest</ApplicationManifest>
<DefineConstants>$(DefineConstants);EXE_PROJECT</DefineConstants>
<OutputPath>$(ProjectDir)bin</OutputPath>
<OutputPath>$(ProjectDir)../../output</OutputPath>
<OutputType>WinExe</OutputType>
<TargetFramework>net48</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
<!--
<PropertyGroup>
@ -412,6 +413,7 @@
<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" />
-->
@ -637,8 +639,10 @@
<Compile Update="tools/Watch/WatchValueBox.cs" SubType="Component" />
<Compile Update="UpdateChecker.cs" SubType="Code" />
</ItemGroup>
<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 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>
</Project>