mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-10 19:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Run gcc checks with NON_MATCHING defined

Browse source
This commit is contained in:
Roman971 2020-03-23 23:15:45 +01:00
parent c2b9feb5d3
commit da151300f7
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
makefile
View file

@ -26,8 +26,8 @@ OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump
CC := $(QEMU_IRIX) -L tools/ido7.1_compiler tools/ido7.1_compiler/usr/bin/cc CC := $(QEMU_IRIX) -L tools/ido7.1_compiler tools/ido7.1_compiler/usr/bin/cc
CC_OLD := $(QEMU_IRIX) -L tools/ido5.3_compiler tools/ido5.3_compiler/usr/bin/cc CC_OLD := $(QEMU_IRIX) -L tools/ido5.3_compiler tools/ido5.3_compiler/usr/bin/cc
# Check code syntax with host compiler (TODO: define NON_MATCHING because the non-matching code is utterly broken) # Check code syntax with host compiler
CC_CHECK := gcc -fno-builtin -fsyntax-only -fsigned-char -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -D _LANGUAGE_C -I include -include stdarg.h CC_CHECK := gcc -fno-builtin -fsyntax-only -fsigned-char -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -D _LANGUAGE_C -D NON_MATCHING -I include -include stdarg.h
CPP := cpp CPP := cpp
MKLDSCRIPT := tools/mkldscript MKLDSCRIPT := tools/mkldscript
@ -157,10 +157,6 @@ build/assets/%.o: assets/%.c
# $(CC_CHECK) $^ # $(CC_CHECK) $^
$(OBJCOPY) -O binary $@ $@.bin $(OBJCOPY) -O binary $@ $@.bin
#build/src/boot/%.o: src/boot/%.c
# $(CC) -c $(CFLAGS) $(OPTIMIZATION) -o $@ $^
# @$(OBJDUMP) -d $@ > $(@:.o=.s)
build/src/overlays/%.o: src/overlays/%.c build/src/overlays/%.o: src/overlays/%.c
$(CC) -c $(CFLAGS) $(OPTIMIZATION) -o $@ $^ $(CC) -c $(CFLAGS) $(OPTIMIZATION) -o $@ $^
$(CC_CHECK) $^ $(CC_CHECK) $^

2
src/code/gfxprint.c
View file

@ -223,7 +223,7 @@ void GfxPrint_SetBasePosPx(GfxPrint* this, s32 x, s32 y) {
#ifdef NON_MATCHING #ifdef NON_MATCHING
// regalloc and ordering differences // regalloc and ordering differences
void GfxPrint_PrintCharImpl(GfxPrint* this, char c) { void GfxPrint_PrintCharImpl(GfxPrint* this, u8 c) {
if (this->flag & GFXPRINT_UPDATE_MODE) { if (this->flag & GFXPRINT_UPDATE_MODE) {
this->flag &= ~GFXPRINT_UPDATE_MODE; this->flag &= ~GFXPRINT_UPDATE_MODE;

4
src/code/z_sample.c
View file

@ -20,8 +20,8 @@ void Sample_Draw(SampleContext* this) {
func_800C6AC4(gfxArr, gfxCtx, "../z_sample.c", 62); func_800C6AC4(gfxArr, gfxCtx, "../z_sample.c", 62);
gSPSegment(gfxCtx->polyOpa.p++, 0, NULL; gSPSegment(gfxCtx->polyOpa.p++, 0x00, NULL);
gSPSegment(gfxCtx->polyOpa.p++, 1, this->staticSegment); gSPSegment(gfxCtx->polyOpa.p++, 0x01, this->staticSegment);
func_80095248(gfxCtx, 0, 0, 0); func_80095248(gfxCtx, 0, 0, 0);