Merge pull request #111 from PatrickStankard/patrickstankard/macos-build

Set `$asm_cmd` for macOS in `build.ps1`
This commit is contained in:
Lorenzooone 2020-03-24 17:51:02 +01:00 committed by GitHub
commit 5b3e435f16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions

View File

@ -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`.

View File

@ -33,12 +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" }
Else {
Write-Host "TODO: what's the Mac version of armips?"
Exit -1
}
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")