From ded8498a5ca3d72c82cbcd81fb7e8b23e6a0dbf0 Mon Sep 17 00:00:00 2001 From: notaz Date: Fri, 15 Nov 2024 01:29:23 +0200 Subject: [PATCH] avoid -Wno-format in general case need this only for libchdr wanting to print int32_t on platforms where int32_t is long int libretro/pcsx_rearmed#851 --- Makefile | 2 +- Makefile.libretro | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5d885066..39b5fbaf 100644 --- a/Makefile +++ b/Makefile @@ -288,7 +288,7 @@ OBJS += $(LCHDR)/src/libchdr_cdrom.o OBJS += $(LCHDR)/src/libchdr_chd.o OBJS += $(LCHDR)/src/libchdr_flac.o OBJS += $(LCHDR)/src/libchdr_huffman.o -$(LCHDR)/src/%.o: CFLAGS += -Wno-unused -Wno-maybe-uninitialized -Wno-format -std=gnu11 +$(LCHDR)/src/%.o: CFLAGS += -Wno-unused -Wno-maybe-uninitialized -std=gnu11 OBJS += $(LCHDR_LZMA)/src/Alloc.o OBJS += $(LCHDR_LZMA)/src/CpuArch.o OBJS += $(LCHDR_LZMA)/src/Delta.o diff --git a/Makefile.libretro b/Makefile.libretro index 21cbd282..7914d715 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -357,12 +357,13 @@ else ifeq ($(platform), ctr) CFLAGS += -DARM11 -D_3DS -D__3DS__ CFLAGS += -DNO_DYLIB -DGPU_UNAI_USE_FLOATMATH -DGPU_UNAI_USE_FLOAT_DIV_MULTINV CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft - CFLAGS += -Wall -mword-relocations + CFLAGS += -mword-relocations CFLAGS += -fomit-frame-pointer CFLAGS_LAST += -O3 # CFLAGS += -funroll-loops # ~500K of bloat CFLAGS += -Ifrontend/3ds -I$(CTRULIB)/include CFLAGS += -Werror=implicit-function-declaration + CFLAGS += -Wno-format CFLAGS += -DHAVE_UNISTD_H CFLAGS += -DZ7_DECL_Int32_AS_long CFLAGS += -DUSE_CTRULIB_2 @@ -402,6 +403,7 @@ else ifneq (,$(filter $(platform),ngc wii wiiu)) CFLAGS += -DHW_WUP CFLAGS += -I frontend/wiiu CFLAGS += -DZ7_DECL_Int32_AS_long + CFLAGS += -Wno-format LIGHTREC_CUSTOM_MAP := 1 LIGHTREC_CUSTOM_MAP_OBJ := libpcsxcore/lightrec/mem_wiiu.o LIGHTREC_CODE_INV := 1 -- 2.39.5