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

Fix compilation of ext. tools, fix style warnings in AutoGenConfig

This commit is contained in:
YoshiRulz 2020-09-23 21:51:32 +10:00
parent f8e624befe
commit 276e8ab185
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
15 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ExternalToolProjects/.build_net48_from_cwd_debug.sh → ExternalToolProjects/.build_debug.sh
View File

0
ExternalToolProjects/.build_net48_from_cwd_release.sh → ExternalToolProjects/.build_release.sh
View File

2
ExternalToolProjects/.run_with_tool.sh Executable file
View File

@ -0,0 +1,2 @@
#!/bin/sh
../../output/EmuHawkMono.sh --open-ext-tool-dll=$(printf *.csproj | head -c-7)

7
ExternalToolProjects/AutoGenConfig/AutoGenConfigForm.cs
View File

@ -76,7 +76,12 @@ namespace BizHawk.Experiment.AutoGenConfig
tuple.Generator != null // Already iterating nested-config groupboxes as GroupUIs.Values; maybe this can be changed to iterate recursively starting with `GroupUIs[""]`?
&& !tuple.Generator.MatchesBaseline(tuple.c, Metadata)
)
.Select(tuple => (tuple.c.Name, tuple.Generator, Baseline: Metadata.BaselineValues[tuple.c.Name], Current: tuple.Generator.GetTValue(tuple.c)))
.Select(tuple => (
tuple.c.Name,
tuple.Generator ?? throw new Exception("never hit"),
Baseline: Metadata.BaselineValues[tuple.c.Name],
Current: tuple.Generator.GetTValue(tuple.c)
))
.Where(tuple => tuple.Baseline != tuple.Current)
.ToList();
if (state.Count == 0) {

8
ExternalToolProjects/AutoGenConfig/ConfigEditorUIGenerators.cs
View File

@ -217,16 +217,16 @@ namespace BizHawk.Experiment.AutoGenConfig
protected virtual string SerializeTValue(TValue v) => v?.ToString() ?? NULL_SERIALIZATION;
#pragma warning disable CS8601
#pragma warning disable CS8604
string IConfigPropEditorUIGen.SerializeTValue(object? v) => SerializeTValue((TValue) v);
#pragma warning restore CS8601
#pragma warning restore CS8604
/// <inheritdoc cref="IConfigPropEditorUIGen.TValueEquality"/>
protected abstract bool TValueEquality(TValue a, TValue b);
#pragma warning disable CS8601
#pragma warning disable CS8604
bool IConfigPropEditorUIGen.TValueEquality(object? a, object? b) => TValueEquality((TValue) a, (TValue) b);
#pragma warning restore CS8601
#pragma warning restore CS8604
protected const string NULL_SERIALIZATION = "(null)";

2
ExternalToolProjects/AutoGenConfig/build_debug.sh
View File

@ -1 +1 @@
../.build_net48_from_cwd_debug.sh
../.build_debug.sh

2
ExternalToolProjects/AutoGenConfig/build_release.sh
View File

@ -1 +1 @@
../.build_net48_from_cwd_release.sh
../.build_release.sh

1
ExternalToolProjects/AutoGenConfig/run_with_tool.sh Symbolic link
View File

@ -0,0 +1 @@
../.run_with_tool.sh

2
ExternalToolProjects/DBMan/build_debug.sh
View File

@ -1 +1 @@
../.build_net48_from_cwd_debug.sh
../.build_debug.sh

2
ExternalToolProjects/DBMan/build_release.sh
View File

@ -1 +1 @@
../.build_net48_from_cwd_release.sh
../.build_release.sh

1
ExternalToolProjects/DBMan/run_with_tool.sh Symbolic link
View File

@ -0,0 +1 @@
../.run_with_tool.sh

2
ExternalToolProjects/HelloWorld/build_debug.sh
View File

@ -1 +1 @@
../.build_net48_from_cwd_debug.sh
../.build_debug.sh

2
ExternalToolProjects/HelloWorld/build_release.sh
View File

@ -1 +1 @@
../.build_net48_from_cwd_release.sh
../.build_release.sh

1
ExternalToolProjects/HelloWorld/run_with_tool.sh Symbolic link
View File

@ -0,0 +1 @@
../.run_with_tool.sh

12
ExternalToolProjects/NET48ExternalToolForm.targets
View File

@ -6,25 +6,25 @@
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
<Reference Include="System.Windows.Forms" />
<Reference Include="BizHawk.Client.Common"
HintPath="$(ProjectDir)../../output/BizHawk.Client.Common.dll"
HintPath="$(ProjectDir)../../output/dll/BizHawk.Client.Common.dll"
Private="true" />
<Reference Include="BizHawk.Client.EmuHawk"
HintPath="$(ProjectDir)../../output/EmuHawk.exe"
Private="true" />
<Reference Include="BizHawk.Common"
HintPath="$(ProjectDir)../../output/BizHawk.Common.dll"
HintPath="$(ProjectDir)../../output/dll/BizHawk.Common.dll"
Private="true" />
<Reference Include="BizHawk.Emulation.Common"
HintPath="$(ProjectDir)../../output/BizHawk.Emulation.Common.dll"
HintPath="$(ProjectDir)../../output/dll/BizHawk.Emulation.Common.dll"
Private="true" />
<Reference Include="BizHawk.Emulation.Cores"
HintPath="$(ProjectDir)../../output/BizHawk.Emulation.Cores.dll"
HintPath="$(ProjectDir)../../output/dll/BizHawk.Emulation.Cores.dll"
Private="true" />
<Reference Include="BizHawk.Emulation.DiscSystem"
HintPath="$(ProjectDir)../../output/BizHawk.Emulation.DiscSystem.dll"
HintPath="$(ProjectDir)../../output/dll/BizHawk.Emulation.DiscSystem.dll"
Private="true" />
<Reference Include="BizHawk.WinForms.Controls"
HintPath="$(ProjectDir)../../output/BizHawk.WinForms.Controls.dll"
HintPath="$(ProjectDir)../../output/dll/BizHawk.WinForms.Controls.dll"
Private="true" />
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">