pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-08 12:02:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing the mac build (#263)

Browse Source
This commit is contained in:
Ethan Roseman 2021-04-18 11:31:33 +09:00 committed by GitHub
parent a557e4cd96
commit 3976b4d614
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/EB8E50.c
View File

@ -7,5 +7,6 @@ const char* ascii_EC2018 = "flo_25";
const char* ascii_EC2020 = "flo_16"; const char* ascii_EC2020 = "flo_16";
const char* ascii_EC2028 = "flo_09"; const char* ascii_EC2028 = "flo_09";
const char* ascii_EC2030 = "flo_08"; const char* ascii_EC2030 = "flo_08";
static const f64 rodata_alignment = 0.0;
INCLUDE_ASM(s32, "EB8E50", func_80240000_EB8E50); INCLUDE_ASM(s32, "EB8E50", func_80240000_EB8E50);

2
src/world/area_arn/arn_07/BECDF0.c
View File

@ -398,6 +398,8 @@ Script N(exitWalk_80242978) = EXIT_WALK_SCRIPT(60, 1, "arn_03", 0);
Script N(exitWalk_802429D4) = EXIT_WALK_SCRIPT(60, 2, "mim_12", 1); Script N(exitWalk_802429D4) = EXIT_WALK_SCRIPT(60, 2, "mim_12", 1);
static const f64 rodata_alignment = 0.0;
Script N(80242A30) = SCRIPT({ Script N(80242A30) = SCRIPT({
DisablePlayerInput(TRUE); DisablePlayerInput(TRUE);
DisablePartnerAI(0); DisablePartnerAI(0);

2
tools/build/configure.py
View File

@ -420,7 +420,7 @@ if __name__ == "__main__":
exec_shell(["make", "-C", str(ROOT / args.splat)]) exec_shell(["make", "-C", str(ROOT / args.splat)])
# on macOS, /usr/bin/cpp defaults to clang rather than gcc (but we need gcc's) # 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 args.cpp is None and sys.platform == "darwin" and "Free Software Foundation" not in exec_shell(["cpp", "--version"]):
print("error: system C preprocessor is not GNU!") 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("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("Use 'brew' to obtain GNU cpp, then run this script again with the --cpp option, e.g.")