From 536cb04a7f6b6cd57ead8117b25acb314b481de7 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 8 Mar 2020 18:49:31 +0100 Subject: [PATCH] Fix the order of addition of CFLAGS CFLAGS from Makefile.common get overwritten by Makefile. This breaks libnx as -DLIBRETRO is missing, change the order to fix this --- Makefile.common | 2 -- Makefile.libretro | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.common b/Makefile.common index 1b2fe0b..fc878d5 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1,5 +1,3 @@ -CFLAGS += -Wall -Wno-switch -Wno-parentheses -Wno-unused-variable -Wno-unused-but-set-variable -Wextra -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes -DLIBRETRO=1 - SOURCES_C := $(CORE_DIR)/access.c $(CORE_DIR)/boot.c $(CORE_DIR)/branch.c \ $(CORE_DIR)/covox.c $(CORE_DIR)/double.c $(CORE_DIR)/ea.c \ $(CORE_DIR)/itab.c \ diff --git a/Makefile.libretro b/Makefile.libretro index 75ccb8f..48b50ad 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -522,6 +522,8 @@ fpic= SHARED= endif +CFLAGS += -Wall -Wno-switch -Wno-parentheses -Wno-unused-variable -Wno-unused-but-set-variable -Wextra -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes -DLIBRETRO=1 + ifeq ($(DEBUG), 1) ifneq (,$(findstring msvc,$(platform))) ifeq ($(STATIC_LINKING),1)