From 0f23e817fb031b4adfe622573dc4bba1a5a6649a Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Mon, 8 Nov 2021 23:41:01 +1000
Subject: [PATCH] Fix build again maybe

---
 Makefile            |  8 --------
 src/lib/lib_47d20.c | 11 ++++-------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index eb6921eee..05361310b 100644
--- a/Makefile
+++ b/Makefile
@@ -212,7 +212,6 @@ CFLAGS = $(C_DEFINES) \
 	-G 0 \
 	-Xcpluscomm \
 	-woff 581,649,819,820,821,838,852 \
-	-w2 \
 	-I include \
 	-I include/PR \
 	-I src/include \
@@ -226,13 +225,6 @@ ASFLAGS = -march=vr4300 -mabi=32 -Iinclude -Iinclude/PR -Isrc/include -Isrc/lib/
 C_FILES := $(shell find src/lib src/game src/inflate -name '*.c')
 S_FILES := $(shell find src/lib src/game src/preamble -name '*.s')
 
-# Files containing MAXFLOAT must be built with qemu, not recomp
-# And luckily this only occurs in 5.3 code, so we can force CCQEMU53 here
-MAXFLOAT_C_FILES != grep -rl 'MAXFLOAT' $(C_FILES)
-MAXFLOAT_O_FILES = $(patsubst src/%.c, $(B_DIR)/%.o, $(MAXFLOAT_C_FILES))
-
-$(MAXFLOAT_O_FILES): CC := $(CCQEMU53)
-
 # Files containing GLOBAL_ASM must be built with the asm_processor
 GLOBALASM_C_FILES != grep -rl 'GLOBAL_ASM(' $(C_FILES)
 GLOBALASM_O_FILES = $(patsubst src/%.c, $(B_DIR)/%.o, $(GLOBALASM_C_FILES))
diff --git a/src/lib/lib_47d20.c b/src/lib/lib_47d20.c
index 443081fec..11a4c7234 100644
--- a/src/lib/lib_47d20.c
+++ b/src/lib/lib_47d20.c
@@ -1,16 +1,13 @@
-// The pragma statement below must not fall on a 2^16 byte boundary after
-// pre-processing because it can cause cfe to crash. So it's placed above the
-// includes to ensure it isn't.
-float fabsf(float value);
-
-#pragma intrinsic (fabsf)
-
 #include <ultra64.h>
 #include "constants.h"
 #include "bss.h"
 #include "data.h"
 #include "types.h"
 
+f32 fabsf(f32 value);
+
+#pragma intrinsic (fabsf)
+
 f32 func00047d20(f32 arg0)
 {
 	f32 sp1c;