mirror of
https://github.com/pmret/papermario.git
synced 2024-11-08 12:02:30 +01:00
Fix some stuff for Mac installation (#753)
This commit is contained in:
parent
993c09a70e
commit
80b605f737
2
.vscode/c_cpp_properties.json
vendored
2
.vscode/c_cpp_properties.json
vendored
@ -26,7 +26,7 @@
|
||||
],
|
||||
"cStandard": "c89",
|
||||
"cppStandard": "c++17",
|
||||
"intelliSenseMode": "gcc-x86"
|
||||
"intelliSenseMode": "${default}"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
11
INSTALL.md
11
INSTALL.md
@ -24,6 +24,17 @@ Install build dependencies:
|
||||
./install.sh
|
||||
```
|
||||
|
||||
> **NOTE:** On Mac, if you get an error that looks like
|
||||
>
|
||||
>```sh
|
||||
>Error: Cannot install md5sha1sum because conflicting formulae are installed.
|
||||
> coreutils: because both install `md5sum` and `sha1sum` binaries
|
||||
>
|
||||
>Please `brew unlink coreutils` before continuing.
|
||||
>```
|
||||
>
|
||||
>it's fine to just open `install.sh` in a text editor, delete the `md5sha1sum` from the `brew install` line, and rerun it (put it back after so you don't accidentally commit it!)
|
||||
|
||||
Copy baseroms into the following places (at least 1 is required):
|
||||
|
||||
* `ver/us/baserom.z64` (sha1: `3837f44cda784b466c9a2d99df70d77c322b97a0`)
|
||||
|
@ -1,4 +1,3 @@
|
||||
capstone
|
||||
PyYAML
|
||||
lark-parser
|
||||
pypng
|
||||
|
@ -714,13 +714,13 @@ if __name__ == "__main__":
|
||||
|
||||
# on macOS, /usr/bin/cpp defaults to clang rather than gcc (but we need gcc's)
|
||||
if args.cpp is None and sys.platform == "darwin" and "Free Software Foundation" not in exec_shell(["cpp", "--version"]):
|
||||
if "Free Software Foundation" in exec_shell(["cpp-11", "--version"]):
|
||||
args.cpp = "cpp-11"
|
||||
if "Free Software Foundation" in exec_shell(["cpp-12", "--version"]):
|
||||
args.cpp = "cpp-12"
|
||||
else:
|
||||
print("error: system C preprocessor is not GNU!")
|
||||
print("This is a known issue on macOS - only clang's cpp is installed by default.")
|
||||
print("Use 'brew' to obtain GNU cpp, then run this script again with the --cpp option, e.g.")
|
||||
print(" ./configure --cpp cpp-11")
|
||||
print(" ./configure --cpp cpp-12")
|
||||
exit(1)
|
||||
|
||||
# default version behaviour is to only do those that exist
|
||||
|
Loading…
Reference in New Issue
Block a user