From 364592e28d42d8abc99930d814abdc9a193bc076 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Mon, 11 Jul 2016 12:30:40 -0700 Subject: [PATCH] Add proper 3DS version support. --- make_base | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/make_base b/make_base index 16e3039..253d0c6 100644 --- a/make_base +++ b/make_base @@ -84,12 +84,13 @@ ifeq ($(TARGET),3DS) OBJECT_FILES := $(filter-out $(BUILT_FILTER),$(OBJECT_FILES)) - ifeq ($(strip $(TITLE)),) - TITLE := $(NAME) - endif - REMOTE_IP ?= 127.0.0.1 # User-defined + TITLE ?= $(NAME) + VERSION_MAJOR ?= 0 + VERSION_MINOR ?= 0 + VERSION_MICRO ?= 0 + CATEGORY ?= Application USE_ON_SD ?= true MEMORY_TYPE ?= Application @@ -143,10 +144,10 @@ ifeq ($(TARGET),3DS) endif LD_FLAGS += -specs=3dsx.specs - COMMON_CC_FLAGS += -mword-relocations -fomit-frame-pointer -ffast-math -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft -DARM11 -D_3DS + COMMON_CC_FLAGS += -mword-relocations -fomit-frame-pointer -ffast-math -march=armv6k -mtune=mpcore -mfloat-abi=hard -mtp=soft -DARM11 -D_3DS -DVERSION_MAJOR=$(VERSION_MAJOR) -DVERSION_MINOR=$(VERSION_MINOR) -DVERSION_MICRO=$(VERSION_MICRO) _3DSXTOOL_FLAGS := - COMMON_MAKEROM_FLAGS := -rsf $(BUILDTOOLS_DIR)/3ds/template.rsf -target t -exefslogo -icon $(BUILD_DIR)/icon.icn -banner $(BUILD_DIR)/banner.bnr -DAPP_TITLE="$(TITLE)" -DAPP_PRODUCT_CODE="$(PRODUCT_CODE)" -DAPP_UNIQUE_ID="$(UNIQUE_ID)" -DAPP_SYSTEM_MODE="$(SYSTEM_MODE)" -DAPP_SYSTEM_MODE_EXT="$(SYSTEM_MODE_EXT)" -DAPP_CATEGORY="$(CATEGORY)" -DAPP_USE_ON_SD="$(USE_ON_SD)" -DAPP_MEMORY_TYPE="$(MEMORY_TYPE)" -DAPP_CPU_SPEED="$(CPU_SPEED)" -DAPP_ENABLE_L2_CACHE="$(ENABLE_L2_CACHE)" + COMMON_MAKEROM_FLAGS := -rsf $(BUILDTOOLS_DIR)/3ds/template.rsf -target t -exefslogo -icon $(BUILD_DIR)/icon.icn -banner $(BUILD_DIR)/banner.bnr -major $(VERSION_MAJOR) -minor $(VERSION_MINOR) -micro $(VERSION_MICRO) -DAPP_TITLE="$(TITLE)" -DAPP_PRODUCT_CODE="$(PRODUCT_CODE)" -DAPP_UNIQUE_ID="$(UNIQUE_ID)" -DAPP_SYSTEM_MODE="$(SYSTEM_MODE)" -DAPP_SYSTEM_MODE_EXT="$(SYSTEM_MODE_EXT)" -DAPP_CATEGORY="$(CATEGORY)" -DAPP_USE_ON_SD="$(USE_ON_SD)" -DAPP_MEMORY_TYPE="$(MEMORY_TYPE)" -DAPP_CPU_SPEED="$(CPU_SPEED)" -DAPP_ENABLE_L2_CACHE="$(ENABLE_L2_CACHE)" ifneq ("$(wildcard $(ROMFS_DIR))","") _3DSXTOOL_FLAGS += --romfs=$(ROMFS_DIR)