From 7b86e387f2004a18dfb023284594671f7212e56a Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Wed, 17 Jul 2019 13:55:14 -0500 Subject: [PATCH] libretro: consolidate, fix, and add nintendo targets --- Makefile | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index bd09985..a0835de 100644 --- a/Makefile +++ b/Makefile @@ -195,6 +195,7 @@ else ifeq ($(platform), ctr) CFLAGS += -march=armv6k -mtune=mpcore -mfloat-abi=hard CFLAGS += -Wall -mword-relocations CFLAGS += -fomit-frame-pointer -ffast-math + CFLAGS += -I$(DEVKITPRO)/libctru/include CFLAGS += -D_3DS STATIC_LINKING=1 @@ -217,40 +218,33 @@ else ifeq ($(platform), xenon) PLATFORM_DEFINES := -D__LIBXENON__ STATIC_LINKING = 1 -# Nintendo Game Cube -else ifeq ($(platform), ngc) - TARGET := $(TARGET_NAME)_libretro_ngc.a - CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT) - CC_AS = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT) - CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT) - AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT) - PLATFORM_DEFINES += -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float - STATIC_LINKING = 1 - HAVE_COMPAT = 1 # Nintendo Game Cube / Wii / WiiU -else ifneq (,$(filter $(platform), wiiu)) +else ifneq (,$(filter $(platform), ngc wii wiiu)) TARGET := $(TARGET_NAME)_libretro_$(platform).a CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT) CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT) AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT) - CFLAGS += -DDEFAULT_CFG_NAME="\"sd:/retroarch/cores/system/atari800.cfg\"" PLATFORM_DEFINES += -DSDL_BYTEORDER=SDL_BIG_ENDIAN -DMSB_FIRST -DBYTE_ORDER=BIG_ENDIAN -DBYTE_ORDER=BIG_ENDIAN PLATFORM_DEFINES += -DGEKKO -mcpu=750 -meabi -mhard-float -DHAVE_STRTOF_L -DHAVE_LOCALE PLATFORM_DEFINES += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int -D_GNU_SOURCE STATIC_LINKING = 1 - PLATFORM_DEFINES += -DWIIU -DHW_RVL -mwup -DWORDS_BIGENDIAN=1 -Dpowerpc -DMSB_FIRST -D__POWERPC__ -D__ppc__ - PLATFORM_DEFINES += -DGEKKO -DWIIU -DHW_RVL -mwup -mcpu=750 -meabi -mhard-float -D__POWERPC__ -D__ppc__ -DMSB_FIRST -DWORDS_BIGENDIAN=1 HAVE_COMPAT = 1 -# Nintendo Wii -else ifeq ($(platform), wii) - TARGET := $(TARGET_NAME)_libretro_wii.a - CC = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT) - CC_AS = $(DEVKITPPC)/bin/powerpc-eabi-gcc$(EXE_EXT) - CXX = $(DEVKITPPC)/bin/powerpc-eabi-g++$(EXE_EXT) - AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT) - PLATFORM_DEFINES += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float - STATIC_LINKING = 1 - HAVE_COMPAT = 1 + ifneq (,$(findstring wiiu,$(platform))) + CFLAGS += -DDEFAULT_CFG_NAME="\"sd:/retroarch/cores/system/atari800.cfg\"" + PLATFORM_DEFINES += -DWIIU -DHW_RVL + else ifneq (,$(findstring wii,$(platform))) + PLATFORM_DEFINES += -DHW_RVL -mrvl + else ifneq (,$(findstring ngc,$(platform))) + PLATFORM_DEFINES += -DHW_DOL -mrvl + endif + +# Nintendo Switch (libnx) +else ifeq ($(platform), libnx) + include $(DEVKITPRO)/libnx/switch_rules + TARGET := $(TARGET_NAME)_libretro_$(platform).a + PLATFORM_DEFINES += -D__SWITCH__ -DHAVE_LIBNX -I$(LIBNX)/include/ -specs=$(LIBNX)/switch.specs + PLATFORM_DEFINES += -march=armv8-a -mtune=cortex-a57 -mtp=soft -mcpu=cortex-a57+crc+fp+simd + STATIC_LINKING=1 # ARM else ifneq (,$(findstring armv,$(platform)))