Prevent -Wall from overriding -Wno flags

This commit is contained in:
Lior Halphon 2020-04-28 21:53:37 +03:00
parent 1e54c55c11
commit 8f6047fdca

View File

@ -1,6 +1,8 @@
STATIC_LINKING := 0 STATIC_LINKING := 0
AR := ar AR := ar
CFLAGS := -Wall $(CFLAGS)
GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)" GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)"
ifneq ($(GIT_VERSION)," unknown") ifneq ($(GIT_VERSION)," unknown")
CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
@ -93,7 +95,7 @@ else ifeq ($(platform), linux-portable)
else ifeq ($(platform), switch) else ifeq ($(platform), switch)
TARGET := $(TARGET_NAME)_libretro_$(platform).a TARGET := $(TARGET_NAME)_libretro_$(platform).a
include $(LIBTRANSISTOR_HOME)/libtransistor.mk include $(LIBTRANSISTOR_HOME)/libtransistor.mk
CFLAGS += -Wl,-q -Wall -O3 -fno-short-enums -fno-optimize-sibling-calls CFLAGS += -Wl,-q -O3 -fno-short-enums -fno-optimize-sibling-calls
STATIC_LINKING=1 STATIC_LINKING=1
# Nintendo WiiU # Nintendo WiiU
else ifeq ($(platform), wiiu) else ifeq ($(platform), wiiu)
@ -141,7 +143,7 @@ else ifeq ($(platform), vita)
TARGET := $(TARGET_NAME)_vita.a TARGET := $(TARGET_NAME)_vita.a
CC = arm-vita-eabi-gcc CC = arm-vita-eabi-gcc
AR = arm-vita-eabi-ar AR = arm-vita-eabi-ar
CFLAGS += -Wl,-q -Wall -O3 -fno-short-enums -fno-optimize-sibling-calls CFLAGS += -Wl,-q -O3 -fno-short-enums -fno-optimize-sibling-calls
STATIC_LINKING = 1 STATIC_LINKING = 1
# Windows MSVC 2017 all architectures # Windows MSVC 2017 all architectures
@ -278,7 +280,7 @@ else
LD = $(CC) LD = $(CC)
endif endif
CFLAGS += -Wall -D__LIBRETRO__ $(fpic) $(INCFLAGS) -std=gnu11 -D_GNU_SOURCE -D_USE_MATH_DEFINES CFLAGS += -D__LIBRETRO__ $(fpic) $(INCFLAGS) -std=gnu11 -D_GNU_SOURCE -D_USE_MATH_DEFINES
all: $(TARGET) all: $(TARGET)