From 277606213aa4bedf0838bc43e6bbd925201cf561 Mon Sep 17 00:00:00 2001 From: Patrick Stankard Date: Mon, 23 Mar 2020 17:33:41 -0400 Subject: [PATCH 1/3] Set $asm_cmd for macOS in build.ps1 --- build.ps1 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build.ps1 b/build.ps1 index f6e669d..1594fa1 100644 --- a/build.ps1 +++ b/build.ps1 @@ -35,10 +35,7 @@ $undefine_obj_file = "src/c/ext.o" If ($IsWindows) { $asm_cmd = "bin/armips.exe" } ElseIf ($IsLinux) { $asm_cmd = "bin/armips" } -Else { - Write-Host "TODO: what's the Mac version of armips?" - Exit -1 -} +ElseIf ($IsMacOS) { $asm_cmd = "bin/armips" } $includes_sym_file = [IO.Path]::ChangeExtension($includes_asm_file, "sym") $output_rom_sym_file = [IO.Path]::ChangeExtension($output_rom_file, "sym") From 5e58e04c84378bdfb2d6802100425233fa3a0fe3 Mon Sep 17 00:00:00 2001 From: Patrick Stankard Date: Tue, 24 Mar 2020 12:45:48 -0400 Subject: [PATCH 2/3] Update README with macOS build instructions --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3970742..a5e6ae4 100644 --- a/README.md +++ b/README.md @@ -47,10 +47,11 @@ This project aims to both complete the VWF codebase and to provide a tool for tr 4. Copy EarthBound ROM to `bin/eb.smc`. 5. Run `build-tools.ps1`. - Windows: `.\build-tools.ps1` in a PowerShell prompt - - Linux: `pwsh build-tools.ps1` + - Linux and MacOS: `pwsh build-tools.ps1` 6. Copy/build `armips` to `bin`. - Windows: grab the latest release [here](https://github.com/Kingcom/armips/releases) and copy the executable to `bin/armips.exe`. - Linux: follow the [README](https://github.com/Kingcom/armips/blob/master/Readme.md) to build `armips` and copy the executable to `bin/armips`. + - MacOS: grab the latest release [here](https://github.com/Emory-M/armips/releases) and copy the executable to `bin/armips`. 2. Building the ROM 1. Run `build.ps1`. 2. The default compiled ROM is copied to `bin/m12.gba`. From de53c83d6069f6d1e898dd1fb96f9f1b9cdf775e Mon Sep 17 00:00:00 2001 From: Patrick Stankard Date: Tue, 24 Mar 2020 12:48:21 -0400 Subject: [PATCH 3/3] Use -or operator instead of double ElseIf --- build.ps1 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.ps1 b/build.ps1 index 1594fa1..f1de5ea 100644 --- a/build.ps1 +++ b/build.ps1 @@ -33,9 +33,8 @@ $combine_script = "src/c/combine.ld" $link_script = "src/c/link.ld" $undefine_obj_file = "src/c/ext.o" -If ($IsWindows) { $asm_cmd = "bin/armips.exe" } -ElseIf ($IsLinux) { $asm_cmd = "bin/armips" } -ElseIf ($IsMacOS) { $asm_cmd = "bin/armips" } +If ($IsWindows) { $asm_cmd = "bin/armips.exe" } +ElseIf ($IsLinux -or $IsMacOS) { $asm_cmd = "bin/armips" } $includes_sym_file = [IO.Path]::ChangeExtension($includes_asm_file, "sym") $output_rom_sym_file = [IO.Path]::ChangeExtension($output_rom_file, "sym")