Fix build again maybe

This commit is contained in:
Ryan Dwyer 2021-11-08 23:41:01 +10:00
parent f3a0285038
commit 0f23e817fb
2 changed files with 4 additions and 15 deletions

View File

@ -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))

View File

@ -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;