Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
jakzo committed Jul 22, 2024
1 parent 677f085 commit 5ac0918
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 124 deletions.
2 changes: 1 addition & 1 deletion SlzMods.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.32510.428
MinimumVisualStudioVersion = 10.0.40219.1
Project("{99DBB66E-FA56-4346-93A6-D79BF4F507FD}") = "Scripts", "scripts\Scripts.csproj", "{6BC0F889-1E24-441C-BA97-2B1896B7AD26}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BoneworksSpeedrunTools", "projects\Boneworks\SpeedrunTools\SpeedrunTools.csproj", "{C33921DC-5778-4EEC-A2D0-E0AE522CC701}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BoneworksSpeedrunTools", "projects\Boneworks\SpeedrunTools\Project.csproj", "{C33921DC-5778-4EEC-A2D0-E0AE522CC701}"
EndProject
Project("{0AD97044-708A-438E-856D-FF9FEE6969C1}") = "BonelabSpeedrunTimer", "projects\Bonelab\SpeedrunTimer\Project.csproj", "{B08C3577-91FF-4261-AA3A-743E011DB435}"
EndProject
Expand Down
5 changes: 0 additions & 5 deletions projects/Bonelab/HandTracking/Project.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,7 @@
<Compile Include="../../../common/Utilities/Geometry.cs" />
<Compile Include="../../../common/Utilities/FpsCounter.cs" />
<Compile Include="../../../common/Bonelab/LevelHooks.cs" />

<Compile Include="../../../common/Bonelab/Levels.cs" />
<Compile Include="../../../common/Utilities/Colliders.cs" />
<Compile Include="../../../common/Utilities/Shaders.cs" />
<Compile Include="../../../common/Utilities/Geometry.cs" />
<Compile Include="../../../common/Utilities/Unity.cs" />
</ItemGroup>

</Project>
30 changes: 30 additions & 0 deletions projects/Boneworks/SpeedrunTools/Project.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="BuildAll">
<Target Name="BuildAll">
<!-- All game/Melon Loader version combinations to build -->
<MSBuild Projects="$(MSBuildProjectFile)" Targets="Build"
Properties="Configuration=$(Configuration);Patch=3;MelonLoader=5" />
</Target>

<PropertyGroup>
<CopyIntoGameAfterBuild>true</CopyIntoGameAfterBuild>

<ProjectGuid>{C33921DC-5778-4EEC-A2D0-E0AE522CC701}</ProjectGuid>
</PropertyGroup>

<ItemGroup>
<Compile Include="AppVersion.cs" />
<Compile Include="src/**/*.cs" />
<Compile Include="../../../common/FlatBuffers/**/*.cs" />
<Compile Include="../../../common/Boneworks/DebugStats.cs" />
<Compile Include="../../../common/Boneworks/HundredPercentState.cs" />
<Compile Include="../../../common/Utilities/IpcServer.cs" />
<Compile Include="../../../common/Utilities/Dbg.cs" />
<Compile Include="../../../common/Utilities/Geometry.cs" />
<Compile Include="../../../common/Utilities/Metadata.cs" />
<Compile Include="../../../common/Utilities/Unity.cs" />
<Compile Include="../../../common/Utilities/Resources.cs" />

<EmbeddedResource Include="resources/*" />
</ItemGroup>

</Project>
116 changes: 0 additions & 116 deletions projects/Boneworks/SpeedrunTools/SpeedrunTools.csproj

This file was deleted.

8 changes: 7 additions & 1 deletion projects/Boneworks/SpeedrunTools/src/Features/Speedrun.cs
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,12 @@ public override void OnLoadingScreen(int nextSceneIdx, int prevSceneIdx) {
else if (nextSceneIdx != Utils.SCENE_MENU_IDX)
RunTimer.Reset(true);

#if DEBUG
var debugStr = " DEBUG";
#else
var debugStr = "";
#endif

var duration = RunTimer.CalculateDuration();
_overlay.Show(string.Join(
"\n",
Expand All @@ -192,7 +198,7 @@ public override void OnLoadingScreen(int nextSceneIdx, int prevSceneIdx) {
? "Speedrun mode disabled"
: $"{Mode.CurrentMode.name} mode enabled",
Mode.CurrentMode),
$"v{BuildInfo.Version}",
$"v{BuildInfo.Version}{debugStr}",
duration?.ToString(
$"{(duration.Value.Hours >= 1 ? "h\\:m" : "")}m\\:ss\\.ff"),
}
Expand Down
2 changes: 1 addition & 1 deletion projects/Boneworks/SpeedrunTools/src/Speedruns/Overlay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public void Hide() {
private Texture TextToTexture(string text) {
TMPro.TextMeshPro tmp;
if (s_loadingText == null) {
s_loadingText = new GameObject("SpeedrunTools_LoadingText");
s_loadingText = new GameObject(LOADING_TEXT_NAME);
// TODO: Is there a way to have this render correctly while not making it
// appear in the scene?
s_loadingText.transform.position = new Vector3(100000, 100000, 100000);
Expand Down
Binary file removed references/Boneworks/MelonLoader.dll
Binary file not shown.
Binary file removed references/Boneworks/Unity.TextMeshPro.dll
Binary file not shown.

0 comments on commit 5ac0918

Please sign in to comment.