From 9b7270cb6af3971de0a2f9e69f632f598dc46b2f Mon Sep 17 00:00:00 2001 From: "David G. F" Date: Sat, 4 Dec 2021 02:01:00 +0100 Subject: [PATCH] Minor improvements in PSP and CTR Makefiles (mostly for devs) (#13317) --- Makefile.ctr | 8 ++++++++ Makefile.psp1 | 19 ++++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Makefile.ctr b/Makefile.ctr index 88315eeefe..f082b28c79 100644 --- a/Makefile.ctr +++ b/Makefile.ctr @@ -10,6 +10,7 @@ BUILD_3DS = 0 BUILD_CIA = 1 LIBCTRU_NO_DEPRECATION = 1 USE_CTRULIB_2 ?= 0 +LOAD_WITHOUT_CORE_INFO ?= 0 APP_TITLE = RetroArch 3DS APP_DESCRIPTION = RetroArch 3DS @@ -106,6 +107,9 @@ endif ifeq ($(strip $(DEVKITPRO)),) $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=devkitpro") endif +ifeq ($(strip $(DEVKITARM)),) + $(error "Please set DEVKITARM in your environment. export DEVKITARM=devkitarm") +endif ifeq ($(strip $(CTRULIB)),) CTRULIB = $(DEVKITPRO)/libctru @@ -115,6 +119,10 @@ ifeq ($(strip $(USE_CTRULIB_2)),1) CFLAGS += -DUSE_CTRULIB_2 endif +ifeq ($(LOAD_WITHOUT_CORE_INFO),1) + CFLAGS += -DLOAD_WITHOUT_CORE_INFO +endif + ifeq ($(strip $(DEVKITTOOLS)),) ifeq ($(strip $(USE_CTRULIB_2)),1) DEVKITTOOLS = $(DEVKITPRO)/tools diff --git a/Makefile.psp1 b/Makefile.psp1 index 8285407357..e9b0bdf0a0 100644 --- a/Makefile.psp1 +++ b/Makefile.psp1 @@ -1,10 +1,11 @@ -BUILD_PRX = 0 -PSP_LARGE_MEMORY = 1 -DEBUG = 0 -HAVE_KERNEL_PRX = 1 -HAVE_THREADS = 1 -BIG_STACK = 0 -WHOLE_ARCHIVE_LINK = 0 +BUILD_PRX ?= 0 +PSP_LARGE_MEMORY ?= 1 +DEBUG ?= 0 +HAVE_KERNEL_PRX ?= 1 +HAVE_THREADS ?= 1 +BIG_STACK ?= 0 +WHOLE_ARCHIVE_LINK ?= 0 +LOAD_WITHOUT_CORE_INFO ?= 0 TARGET = retroarchpsp @@ -65,6 +66,10 @@ ifeq ($(BIG_STACK), 1) CFLAGS += -DBIG_STACK endif +ifeq ($(LOAD_WITHOUT_CORE_INFO),1) +RARCH_DEFINES += -DLOAD_WITHOUT_CORE_INFO +endif + CFLAGS += $(RARCH_DEFINES) EXTRA_TARGETS = EBOOT.PBP