diff --git a/build/buildtools/commondefs.sysmenu b/build/buildtools/commondefs.sysmenu index 2375d82d..b2d43b7f 100644 --- a/build/buildtools/commondefs.sysmenu +++ b/build/buildtools/commondefs.sysmenu @@ -25,14 +25,22 @@ SPACE ?= $(EMPTY) $(EMPTY) TWL_KEYSDIR ?= $(SYSMENU_ROOT)/keys/dummy +#---------------------------------------------------------------------------- +### TWL-commondefs +# +#include $(TWLSDK_ROOT)/build/buildtools/commondefs +include $(NITROSYSTEM_ROOT)/build/buildtools/commondefs + #---------------------------------------------------------------------------- # TWL-SYSTEM-MENU path settings # -SYSMENU_ROOT := $(subst $(SPACE),\ ,$(subst \,/,$(TWL_IPL_RED_ROOT))) +#SYSMENU_ROOT := $(subst $(SPACE),\ ,$(subst \,/,$(TWL_IPL_RED_ROOT))) +SYSMENU_ROOT := $(call eupath,$(TWL_IPL_RED_ROOT)) + SYSMENU_BUILDTOOLSDIR := $(SYSMENU_ROOT)/build/buildtools SYSMENU_INCDIR := $(SYSMENU_ROOT)/include \ - $(ROOT)/build/libraries/spi/arm9/include \ + $(ROOT)/build/libraries/spi/ARM9/include \ $(ROOT)/build/libraries/mb/common/include SYSMENU_TOOLSDIR := $(SYSMENU_ROOT)/tools SYSMENU_COMPONENTSDIR := $(SYSMENU_ROOT)/components @@ -41,13 +49,6 @@ LDEPENDS_LCF += $(SYSMENU_BUILDTOOLSDIR)/commondefs.sysmenu LDEPENDS_RES += $(SYSMENU_BUILDTOOLSDIR)/commondefs.sysmenu -#---------------------------------------------------------------------------- -### TWL-commondefs -# -#include $(TWLSDK_ROOT)/build/buildtools/commondefs -include $(NITROSYSTEM_ROOT)/build/buildtools/commondefs - - ifneq ($(TARGET_TAD),) TARGETS += $(TARGET_TAD) endif @@ -93,14 +94,17 @@ MAKETAD ?= $(ROOT)/tools/bin/makeTad.pl ### Global Library resettings -GINCLUDES := $(SYSMENU_INCDIR) $(GINCLUDES) $(ES_ROOT)/twl/include +GINCLUDES := $(SYSMENU_INCDIR) $(GINCLUDES) +ifneq ($(ES_ROOT),) +GINCLUDES += $(ES_ROOT)/twl/include +endif GLIBRARY_DIRS := $(SYSMENU_LIBDIR) $(GLIBRARY_DIRS) GLIBRARIES := $(SYSMENU_LIBS) $(GLIBRARIES) #---------------------------------------------------------------------------- # TWLSYSMENU_INSTALL_ROOT # -SYSMENU_INSTALL_ROOT := $(SYSMENU_ROOT) +SYSMENU_INSTALL_ROOT := $(subst $(SPACE),\ ,$(subst \,/,$(TWL_IPL_RED_ROOT))) SYSMENU_INSTALL_INCDIR := $(SYSMENU_INSTALL_ROOT)/include SYSMENU_INSTALL_TOOLSDIR := $(SYSMENU_INSTALL_ROOT)/tools SYSMENU_INSTALL_LIBDIR := $(SYSMENU_INSTALL_ROOT)/lib/$(TWL_LIBTYPE) diff --git a/build/gcdfirm/gcdfirm-disp/Makefile b/build/gcdfirm/gcdfirm-disp/Makefile index 9aa71c02..e541274c 100644 --- a/build/gcdfirm/gcdfirm-disp/Makefile +++ b/build/gcdfirm/gcdfirm-disp/Makefile @@ -38,7 +38,7 @@ LDEPENDS_BIN += wram_regs/wram_regs.rbin MAKEFIRM_FLAGS += -p FIRM_SPEC = gcdfirm.gcdsf -LDIRT_CLEAN += $(TARGETS) \ +LDIRT_CLEAN += $(wildcard *.gcd) \ rsa_public.sbin \ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs diff --git a/build/gcdfirm/gcdfirm-print/Makefile b/build/gcdfirm/gcdfirm-print/Makefile index b6e8206f..592a90bb 100644 --- a/build/gcdfirm/gcdfirm-print/Makefile +++ b/build/gcdfirm/gcdfirm-print/Makefile @@ -31,7 +31,7 @@ LDEPENDS_BIN += ../../norfirm/norfirm-print/wram_regs/wram_regs.rbin MAKEFIRM_FLAGS += -p FIRM_SPEC = gcdfirm.gcdsf -LDIRT_CLEAN += $(TARGETS) \ +LDIRT_CLEAN += $(wildcard *.gcd) \ rsa_public.sbin \ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs diff --git a/build/gcdfirm/sdmc-launcher/Makefile b/build/gcdfirm/sdmc-launcher/Makefile index 008df31e..3fc5086b 100644 --- a/build/gcdfirm/sdmc-launcher/Makefile +++ b/build/gcdfirm/sdmc-launcher/Makefile @@ -12,8 +12,8 @@ # in whole or in part, without the prior written consent of Nintendo. # # $Date:: $ -# $Rev:$ -# $Author:$ +# $Rev$ +# $Author$ #---------------------------------------------------------------------------- @@ -38,7 +38,7 @@ LDEPENDS_BIN += wram_regs/wram_regs.rbin MAKEFIRM_FLAGS += -p FIRM_SPEC = gcdfirm.gcdsf -LDIRT_CLEAN += $(TARGETS) \ +LDIRT_CLEAN += $(wildcard *.gcd) \ rsa_public.sbin \ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs diff --git a/build/nandfirm/menu-launcher/Makefile b/build/nandfirm/menu-launcher/Makefile index 51258670..232ee475 100644 --- a/build/nandfirm/menu-launcher/Makefile +++ b/build/nandfirm/menu-launcher/Makefile @@ -38,7 +38,7 @@ LDEPENDS_BIN += wram_regs/wram_regs.rbin MAKEFIRM_FLAGS += -p FIRM_SPEC = nandfirm.nandsf -LDIRT_CLEAN += $(TARGETS) \ +LDIRT_CLEAN += $(wildcard *.nand) \ rsa_public.sbin \ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs diff --git a/build/nandfirm/menu-launcher2/Makefile b/build/nandfirm/menu-launcher2/Makefile index d16233d3..beab20d3 100644 --- a/build/nandfirm/menu-launcher2/Makefile +++ b/build/nandfirm/menu-launcher2/Makefile @@ -38,7 +38,7 @@ LDEPENDS_BIN += wram_regs/wram_regs.rbin MAKEFIRM_FLAGS += -p FIRM_SPEC = nandfirm.nandsf -LDIRT_CLEAN += $(TARGETS) \ +LDIRT_CLEAN += $(wildcard *.nand) \ rsa_public.sbin \ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs diff --git a/build/nandfirm/nandfirm-print/Makefile b/build/nandfirm/nandfirm-print/Makefile index 81ff17bf..ecd52984 100644 --- a/build/nandfirm/nandfirm-print/Makefile +++ b/build/nandfirm/nandfirm-print/Makefile @@ -31,7 +31,7 @@ LDEPENDS_BIN += ../../norfirm/norfirm-print/wram_regs/wram_regs.rbin MAKEFIRM_FLAGS += -p FIRM_SPEC = nandfirm-BB.nandsf -LDIRT_CLEAN += $(TARGETS) \ +LDIRT_CLEAN += $(wildcard *.nand) \ rsa_public.sbin \ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs diff --git a/build/nandfirm/sdmc-launcher/Makefile b/build/nandfirm/sdmc-launcher/Makefile index eec49655..3e3117e5 100644 --- a/build/nandfirm/sdmc-launcher/Makefile +++ b/build/nandfirm/sdmc-launcher/Makefile @@ -38,7 +38,7 @@ LDEPENDS_BIN += wram_regs/wram_regs.rbin MAKEFIRM_FLAGS += -p FIRM_SPEC = nandfirm.nandsf -LDIRT_CLEAN += $(TARGETS) \ +LDIRT_CLEAN += $(wildcard *.nand) \ rsa_public.sbin \ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs diff --git a/build/norfirm/firm-dev/Makefile b/build/norfirm/firm-dev/Makefile index 44af7dc9..0777144a 100644 --- a/build/norfirm/firm-dev/Makefile +++ b/build/norfirm/firm-dev/Makefile @@ -38,7 +38,7 @@ LDEPENDS_BIN += wram_regs/wram_regs.rbin MAKEFIRM_FLAGS += -p FIRM_SPEC = norfirm.norsf -LDIRT_CLEAN += $(TARGETS) \ +LDIRT_CLEAN += $(wildcard *.nor) \ rsa_public.sbin \ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs diff --git a/build/norfirm/norfirm-print/Makefile b/build/norfirm/norfirm-print/Makefile index be7f9209..3e9e4ff6 100644 --- a/build/norfirm/norfirm-print/Makefile +++ b/build/norfirm/norfirm-print/Makefile @@ -38,7 +38,7 @@ LDEPENDS_BIN += wram_regs/wram_regs.rbin MAKEFIRM_FLAGS += -p FIRM_SPEC = norfirm-BB.norsf -LDIRT_CLEAN += $(TARGETS) \ +LDIRT_CLEAN += $(wildcard *.nor) \ rsa_public.sbin \ include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs diff --git a/build/tests/AppliCooperation/CooperationA/ARM9/Makefile b/build/tests/AppliCooperation/CooperationA/ARM9/Makefile index 80716abc..66f53e68 100644 --- a/build/tests/AppliCooperation/CooperationA/ARM9/Makefile +++ b/build/tests/AppliCooperation/CooperationA/ARM9/Makefile @@ -31,7 +31,7 @@ TARGET_BIN = main.srl ROM_SPEC = main.rsf -MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc +MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc SRCS = main.c CooperationA.c \ $(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c diff --git a/build/tests/AppliCooperation/CooperationB/ARM9/Makefile b/build/tests/AppliCooperation/CooperationB/ARM9/Makefile index dd168831..276471a5 100644 --- a/build/tests/AppliCooperation/CooperationB/ARM9/Makefile +++ b/build/tests/AppliCooperation/CooperationB/ARM9/Makefile @@ -31,7 +31,7 @@ TARGET_BIN = main.srl ROM_SPEC = main.rsf -MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc +MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc SRCS = main.c CooperationB.c \ $(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c diff --git a/build/tests/AppliCooperation/CooperationC/ARM9/Makefile b/build/tests/AppliCooperation/CooperationC/ARM9/Makefile index 58c91082..827122e5 100644 --- a/build/tests/AppliCooperation/CooperationC/ARM9/Makefile +++ b/build/tests/AppliCooperation/CooperationC/ARM9/Makefile @@ -31,7 +31,7 @@ TARGET_BIN = main.srl ROM_SPEC = main.rsf -MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc +MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc SRCS = main.c CooperationC.c \ $(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c diff --git a/build/tests/ExecPreLoadedApp/ARM9/Makefile b/build/tests/ExecPreLoadedApp/ARM9/Makefile index eb99e626..ec8b2bda 100644 --- a/build/tests/ExecPreLoadedApp/ARM9/Makefile +++ b/build/tests/ExecPreLoadedApp/ARM9/Makefile @@ -30,7 +30,7 @@ TARGET_BIN = main.srl LCFILE_SPEC = ARM9-TS.lsf ROM_SPEC = main.rsf -MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc +MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc SRCS = main.c ExecPreLoadedApp.c \ $(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c diff --git a/build/tests/RelocateChecker/ARM7/hyena_rc.lsf b/build/tests/RelocateChecker/ARM7/hyena_rc.lsf index d8d082c6..cd4ad3c8 100644 --- a/build/tests/RelocateChecker/ARM7/hyena_rc.lsf +++ b/build/tests/RelocateChecker/ARM7/hyena_rc.lsf @@ -54,6 +54,7 @@ Autoload WRAM libcdc_sp$(LIBSUFFIX).a \ libtpex_sp$(LIBSUFFIX).a \ libmicex_sp$(LIBSUFFIX).a \ + libmcu_sp$(LIBSUFFIX).a \ libboot_sp$(LIBSUFFIX).a \ libreboot_sp$(LIBSUFFIX).a \ libcardboot_sp$(LIBSUFFIX).a \ diff --git a/build/tests/RelocateChecker/ARM7/hyena_rc5.lsf b/build/tests/RelocateChecker/ARM7/hyena_rc5.lsf index 5ff632ed..5ffa3bbc 100644 --- a/build/tests/RelocateChecker/ARM7/hyena_rc5.lsf +++ b/build/tests/RelocateChecker/ARM7/hyena_rc5.lsf @@ -47,6 +47,7 @@ Static $(TARGET_NAME) libcdc_sp$(LIBSUFFIX).a \ libtpex_sp$(LIBSUFFIX).a \ libmicex_sp$(LIBSUFFIX).a \ + libmcu_sp$(LIBSUFFIX).a \ libboot_sp$(LIBSUFFIX).a \ libreboot_sp$(LIBSUFFIX).a \ libcardboot_sp$(LIBSUFFIX).a \ diff --git a/build/tests/RelocateChecker/ARM9/Makefile.0 b/build/tests/RelocateChecker/ARM9/Makefile.0 index 1ae632c3..5d383ad9 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.0 +++ b/build/tests/RelocateChecker/ARM9/Makefile.0 @@ -46,7 +46,7 @@ LCFILE_SPEC = ARM9-TS.lsf ROM_SPEC = main.rsf LCFILE_TEMPLATE = rc$(TARGET_NUMBER).lcf.template -MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc +MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc SRCS = main.c RelocateChecker.c \ $(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c diff --git a/build/tests/RelocateChecker/ARM9/Makefile.1 b/build/tests/RelocateChecker/ARM9/Makefile.1 index 49f42eaf..7eb0972e 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.1 +++ b/build/tests/RelocateChecker/ARM9/Makefile.1 @@ -46,7 +46,7 @@ LCFILE_SPEC = ARM9-TS.lsf ROM_SPEC = main.rsf LCFILE_TEMPLATE = rc$(TARGET_NUMBER).lcf.template -MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc +MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc SRCS = main.c RelocateChecker.c \ $(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c diff --git a/build/tests/RelocateChecker/ARM9/Makefile.2 b/build/tests/RelocateChecker/ARM9/Makefile.2 index 9579246a..3d4db7ca 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.2 +++ b/build/tests/RelocateChecker/ARM9/Makefile.2 @@ -46,7 +46,7 @@ LCFILE_SPEC = ARM9-TS.lsf ROM_SPEC = main.rsf LCFILE_TEMPLATE = rc$(TARGET_NUMBER).lcf.template -MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc +MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc SRCS = main.c RelocateChecker.c \ $(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c diff --git a/build/tests/RelocateChecker/ARM9/Makefile.3 b/build/tests/RelocateChecker/ARM9/Makefile.3 index c00d9c26..0bfe8dee 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.3 +++ b/build/tests/RelocateChecker/ARM9/Makefile.3 @@ -46,7 +46,7 @@ LCFILE_SPEC = ARM9-TS.lsf ROM_SPEC = main.rsf LCFILE_TEMPLATE = rc$(TARGET_NUMBER).lcf.template -MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc +MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc SRCS = main.c RelocateChecker.c \ $(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c diff --git a/build/tests/RelocateChecker/ARM9/Makefile.4 b/build/tests/RelocateChecker/ARM9/Makefile.4 index a446d6ab..c921713d 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.4 +++ b/build/tests/RelocateChecker/ARM9/Makefile.4 @@ -46,7 +46,7 @@ LCFILE_SPEC = ARM9-TS.lsf ROM_SPEC = main.rsf LCFILE_TEMPLATE = rc$(TARGET_NUMBER).lcf.template -MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc +MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc SRCS = main.c RelocateChecker.c \ $(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c diff --git a/build/tests/RelocateChecker/ARM9/Makefile.5 b/build/tests/RelocateChecker/ARM9/Makefile.5 index fde9af4d..29881c10 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.5 +++ b/build/tests/RelocateChecker/ARM9/Makefile.5 @@ -46,7 +46,7 @@ LCFILE_SPEC = ARM9-TS.lsf ROM_SPEC = main.rsf LCFILE_TEMPLATE = rc$(TARGET_NUMBER).lcf.template -MISC_DIR = $(TWL_IPL_RED_ROOT)/build/systemMenu_RED/misc +MISC_DIR = $(SYSMENU_ROOT)/build/systemMenu_RED/misc SRCS = main.c RelocateChecker.c \ $(MISC_DIR)/src/misc.c $(MISC_DIR)/src/cmn.c diff --git a/build/tests/RelocateChecker/crt/ARM7/Makefile.LTD b/build/tests/RelocateChecker/crt/ARM7/Makefile.LTD index afd03ffb..95731aed 100644 --- a/build/tests/RelocateChecker/crt/ARM7/Makefile.LTD +++ b/build/tests/RelocateChecker/crt/ARM7/Makefile.LTD @@ -27,6 +27,8 @@ TWL_NO_STD_PCHDR = True # Avoid to build THUMB version object override TWL_CODEGEN = ARM +override TWL_ARCHGEN = LIMITED + SRCDIR = ../common/src src INCDIR = ../common/include diff --git a/build/tools/makerom.TWL.shop/Makefile b/build/tools/makerom.TWL.shop/Makefile index bd1d33f3..87f7e3ef 100644 --- a/build/tools/makerom.TWL.shop/Makefile +++ b/build/tools/makerom.TWL.shop/Makefile @@ -83,7 +83,7 @@ MACROS = -I$(ROOT)/build/tools/makerom.TWL \ #INSTALL_DIR = $(TWL_INSTALL_TOOLSDIR)/bin #INSTALL_TARGETS = $(TARGETS) rom_header.template.sbin -INSTALL_DIR = $(TWL_IPL_RED_ROOT)/tools/bin +INSTALL_DIR = $(SYSMENU_INSTALL_TOOLSDIR)/bin INSTALL_TARGETS = $(TARGETS) LDIRT_CLEAN = $(OBJECTS) $(TARGETS) version.h \ diff --git a/build/tools/makerom.TWL.sys/Makefile b/build/tools/makerom.TWL.sys/Makefile index 37c1c103..ad37bf68 100644 --- a/build/tools/makerom.TWL.sys/Makefile +++ b/build/tools/makerom.TWL.sys/Makefile @@ -83,7 +83,7 @@ MACROS = -I$(ROOT)/build/tools/makerom.TWL \ #INSTALL_DIR = $(TWL_INSTALL_TOOLSDIR)/bin #INSTALL_TARGETS = $(TARGETS) rom_header.template.sbin -INSTALL_DIR = $(TWL_IPL_RED_ROOT)/tools/bin +INSTALL_DIR = $(SYSMENU_INSTALL_TOOLSDIR)/bin INSTALL_TARGETS = $(TARGETS) LDIRT_CLEAN = $(OBJECTS) $(TARGETS) version.h \