From da6cdf8594d61d97d86c4869bc2932969c92ba60 Mon Sep 17 00:00:00 2001 From: Mats A Date: Tue, 23 Jul 2019 20:38:11 +0200 Subject: [PATCH] remove unneeded includes and small cleanup --- Makefile.libnx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.libnx b/Makefile.libnx index 436424ebd3..c4e0bff98a 100644 --- a/Makefile.libnx +++ b/Makefile.libnx @@ -114,7 +114,7 @@ APP_ICON := pkg/libnx/retroarch.jpg ARCH := -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE -mcpu=cortex-a57+crc+fp+simd CFLAGS := -g -Wall -O3 -ffast-math -ffunction-sections \ - $(ARCH) $(DEFINES) $(INCLUDE_DIRS) -Ideps -Ideps/libz -Ilibretro-common/include -Ilibretro-common/include/compat/zlib -Ideps/stb -I$(LIBNX)/include -I$(PORTLIBS)/include/ -include $(LIBNX)/include/switch.h #$(shell $(PORTLIBS)/bin/freetype-config --cflags) + $(ARCH) $(DEFINES) $(INCLUDE_DIRS) -I$(LIBNX)/include -I$(PORTLIBS)/include/ -include $(LIBNX)/include/switch.h #$(shell $(PORTLIBS)/bin/freetype-config --cflags) CFLAGS += $(INCLUDE) -DSWITCH=1 -DHAVE_LIBNX=1 -DNXLINK=1 -DHAVE_SHADERPIPELINE -DHAVE_UPDATE_ASSETS -DHAVE_STB_FONT #-DHAVE_FREETYPE @@ -127,16 +127,15 @@ CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11 ASFLAGS := -g $(ARCH) LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs $(ARCH) -Wl,--allow-multiple-definition -Wl,-Map,$(notdir $*.map) +# add things from Makefile.common +CFLAGS += $(DEF_FLAGS) + LIBS := -lswresample -lavformat -lavcodec -lavutil -lswscale -lstdc++ -lbz2 -lpng -lz -lnx -lm ifeq ($(HAVE_OPENGL), 1) LIBS := -lEGL -lglapi -ldrm_nouveau $(LIBS) endif -# add things from Makefile.common -CFLAGS += $(DEF_FLAGS) -INCLUDES += $(INCLUDE_DIRS) - #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing # include and lib