From df3646690bf1c0bb5469f843d799630a8d9ac732 Mon Sep 17 00:00:00 2001 From: David Joslin Date: Sat, 1 Apr 2023 04:39:45 -0700 Subject: [PATCH] Change bin directory to sm64ex-coop, copy lang dir --- coop-compiler/BuildUtil.cs | 3 ++- coop-compiler/DirUtil.cs | 2 +- coop-compiler/coop-compiler.csproj | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/coop-compiler/BuildUtil.cs b/coop-compiler/BuildUtil.cs index 22774b6a..b2fe221c 100644 --- a/coop-compiler/BuildUtil.cs +++ b/coop-compiler/BuildUtil.cs @@ -242,7 +242,7 @@ public async Task BuildAsync(bool buildDirectX) // cleanup old files SetStage("cleanup old files"); - string binDir = dirUtil.WritePathNear("bin"); + string binDir = dirUtil.WritePathNear("sm64ex-coop"); string downloadsDir = dirUtil.WritePath("downloads"); string environmentDir = dirUtil.WritePath("environment"); string tmpDir = dirUtil.WritePath("tmp"); @@ -337,6 +337,7 @@ await RunProgram( if (!File.Exists(exePath)) { throw new Exception("Could not find exe") ; } if (Directory.Exists(buildDir + @"\res")) { await CopyDirectoryAsync(buildDir + @"\res", binDir + @"\res"); } if (Directory.Exists(buildDir + @"\dynos")) { await CopyDirectoryAsync(buildDir + @"\dynos", binDir + @"\dynos"); } + if (Directory.Exists(buildDir + @"\lang")) { await CopyDirectoryAsync(buildDir + @"\lang", binDir + @"\lang"); } foreach (string f in Directory.GetFiles(buildDir)) { if (f.ToLower().EndsWith(".exe") || f.ToLower().EndsWith(".dll") || f.ToLower().EndsWith(".map")) diff --git a/coop-compiler/DirUtil.cs b/coop-compiler/DirUtil.cs index c8d6f902..933c1306 100644 --- a/coop-compiler/DirUtil.cs +++ b/coop-compiler/DirUtil.cs @@ -55,7 +55,7 @@ private string FindFile(string filename) public void FindFiles() { - exePath = FindFile("bin\\sm64.us.f3dex2e.exe"); + exePath = FindFile("sm64ex-coop\\sm64.us.f3dex2e.exe"); romPath = FindFile("rom\\baserom.us.z64"); if (romPath != null && !MiscUtil.ValidRom(romPath)) { diff --git a/coop-compiler/coop-compiler.csproj b/coop-compiler/coop-compiler.csproj index 0e5a4cab..945423a2 100644 --- a/coop-compiler/coop-compiler.csproj +++ b/coop-compiler/coop-compiler.csproj @@ -6,7 +6,7 @@ coop_builder true x86 - 1.0.0.7 + 1.0.0.8 AnyCPU;x86;x64 icon.png