diff --git a/build/buildtools/commondefs.sysmenu b/build/buildtools/commondefs.sysmenu index 3554729b..da133f99 100644 --- a/build/buildtools/commondefs.sysmenu +++ b/build/buildtools/commondefs.sysmenu @@ -106,6 +106,11 @@ ifeq ($(SYSM_BUILD_FOR_DEBUGGER),TRUE) MACRO_FLAGS += -DSYSM_BUILD_FOR_DEBUGGER endif +#---------------------------------------------------------------------------- +# ARM7コンポーネントにARMビルドを使用する + +TWL_BUILDTYPE_ARM7 := $(subst $(CODEGEN_ARCH),,$(TWL_BUILDTYPE_ARM7)) + #---------------------------------------------------------------------------- endif # TWL_SYSMENU_COMMONDEFS_ #----- End of commondefs ----- diff --git a/build/components/hyena.TWL/Makefile b/build/components/hyena.TWL/Makefile index a9d9d186..f85e1e6a 100644 --- a/build/components/hyena.TWL/Makefile +++ b/build/components/hyena.TWL/Makefile @@ -24,7 +24,7 @@ override TARGET_PLATFORM = TWL override TWL_PROC = ARM7 override TWL_ARCHGEN = LIMITED TWL_NO_STD_PCHDR = True -TWL_CODEGEN ?= ARM +override TWL_CODEGEN = ARM FIRM_LIBSUFFIX = .firm$(ARCHGEN_TYPE)$(CODEGEN_ARCH) diff --git a/build/components/jackal.TWL/Makefile b/build/components/jackal.TWL/Makefile index fd18e91e..770497b3 100644 --- a/build/components/jackal.TWL/Makefile +++ b/build/components/jackal.TWL/Makefile @@ -25,7 +25,7 @@ override TWL_PROC = ARM7 override TWL_ARCHGEN = LIMITED override TWL_PLATFORM = TS TWL_NO_STD_PCHDR = True -TWL_CODEGEN ?= ARM +override TWL_CODEGEN = ARM FIRM_LIBSUFFIX = .firm$(ARCHGEN_TYPE)$(CODEGEN_ARCH) diff --git a/build/debugsoft/Jpeg/SdToPhoto/Makefile b/build/debugsoft/Jpeg/SdToPhoto/Makefile index 3707d142..528c515f 100644 --- a/build/debugsoft/Jpeg/SdToPhoto/Makefile +++ b/build/debugsoft/Jpeg/SdToPhoto/Makefile @@ -17,7 +17,7 @@ #---------------------------------------------------------------------------- override TARGET_PLATFORM = TWL -override TARGET_CODEGEN = ARM +override TWL_CODEGEN = ARM override TWL_ARCHGEN = LIMITED diff --git a/build/debugsoft/MakerTitle/SaveData/DisplayVersion/Makefile b/build/debugsoft/MakerTitle/SaveData/DisplayVersion/Makefile index 0bb8d479..65be5d9b 100644 --- a/build/debugsoft/MakerTitle/SaveData/DisplayVersion/Makefile +++ b/build/debugsoft/MakerTitle/SaveData/DisplayVersion/Makefile @@ -18,7 +18,7 @@ override TARGET_PLATFORM = TWL -override TARGET_CODEGEN = ARM +override TWL_CODEGEN = ARM override TWL_ARCHGEN = LIMITED ifndef MODE diff --git a/build/debugsoft/MakerTitle/TitleList/Makefile b/build/debugsoft/MakerTitle/TitleList/Makefile index b2f2c5d2..2e657dd4 100644 --- a/build/debugsoft/MakerTitle/TitleList/Makefile +++ b/build/debugsoft/MakerTitle/TitleList/Makefile @@ -18,7 +18,7 @@ override TARGET_PLATFORM = TWL -override TARGET_CODEGEN = ARM +override TWL_CODEGEN = ARM override TWL_ARCHGEN = LIMITED diff --git a/build/debugsoft/Wireless/WifiIcon/Makefile b/build/debugsoft/Wireless/WifiIcon/Makefile index abf9410a..394e9fd9 100644 --- a/build/debugsoft/Wireless/WifiIcon/Makefile +++ b/build/debugsoft/Wireless/WifiIcon/Makefile @@ -17,7 +17,7 @@ #---------------------------------------------------------------------------- override TARGET_PLATFORM = TWL -override TARGET_CODEGEN = ARM +override TWL_CODEGEN = ARM override TWL_ARCHGEN = LIMITED diff --git a/build/gcdfirm/gcdfirm-disp/wram_regs/Makefile b/build/gcdfirm/gcdfirm-disp/wram_regs/Makefile index 66504d9a..e79917a2 100644 --- a/build/gcdfirm/gcdfirm-disp/wram_regs/Makefile +++ b/build/gcdfirm/gcdfirm-disp/wram_regs/Makefile @@ -12,12 +12,12 @@ # in whole or in part, without the prior written consent of Nintendo. # # $Date:: $ -# $Rev:$ -# $Author:$ +# $Rev$ +# $Author$ #---------------------------------------------------------------------------- override TARGET_PLATFORM := TWL -override TARGET_CODEGEN := ARM +override TWL_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/gcdfirm/sdmc-launcher-writer/wram_regs/Makefile b/build/gcdfirm/sdmc-launcher-writer/wram_regs/Makefile index 1c1afc6d..e79917a2 100644 --- a/build/gcdfirm/sdmc-launcher-writer/wram_regs/Makefile +++ b/build/gcdfirm/sdmc-launcher-writer/wram_regs/Makefile @@ -17,7 +17,7 @@ #---------------------------------------------------------------------------- override TARGET_PLATFORM := TWL -override TARGET_CODEGEN := ARM +override TWL_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/gcdfirm/sdmc-launcher/wram_regs/Makefile b/build/gcdfirm/sdmc-launcher/wram_regs/Makefile index 76342425..4e9ffde9 100644 --- a/build/gcdfirm/sdmc-launcher/wram_regs/Makefile +++ b/build/gcdfirm/sdmc-launcher/wram_regs/Makefile @@ -17,7 +17,7 @@ #---------------------------------------------------------------------------- override TARGET_PLATFORM := TWL -override TARGET_CODEGEN := ARM +override TWL_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/libraries/aes/ARM7/Makefile b/build/libraries/aes/ARM7/Makefile index 810b504f..b06ea6cf 100644 --- a/build/libraries/aes/ARM7/Makefile +++ b/build/libraries/aes/ARM7/Makefile @@ -12,8 +12,8 @@ # in whole or in part, without the prior written consent of Nintendo. # # $Date:: $ -# $Rev:$ -# $Author:$ +# $Rev$ +# $Author$ #---------------------------------------------------------------------------- SUBDIRS = @@ -23,7 +23,7 @@ SUBMAKES = #---------------------------------------------------------------------------- # build ARM & THUMB libraries -TWL_CODEGEN_ALL ?= TRUE +override TWL_CODEGEN = ALL # Codegen for sub processer TWL_PROC = ARM7 diff --git a/build/libraries/fs/ARM7/Makefile b/build/libraries/fs/ARM7/Makefile index f76a36c4..6a4d6dce 100644 --- a/build/libraries/fs/ARM7/Makefile +++ b/build/libraries/fs/ARM7/Makefile @@ -23,7 +23,7 @@ SUBMAKES = #---------------------------------------------------------------------------- # build ARM & THUMB libraries -TWL_CODEGEN_ALL ?= TRUE +override TWL_CODEGEN = ALL # Codegen for sub processer TWL_PROC = ARM7 diff --git a/build/libraries/nvram/ARM7/Makefile b/build/libraries/nvram/ARM7/Makefile index 0677f004..39f2f275 100644 --- a/build/libraries/nvram/ARM7/Makefile +++ b/build/libraries/nvram/ARM7/Makefile @@ -21,7 +21,7 @@ SUBDIRS = #---------------------------------------------------------------------------- # build ARM & THUMB libraries -TWL_CODEGEN_ALL ?= True +override TWL_CODEGEN = ALL TWL_PROC = ARM7 diff --git a/build/libraries/os/ARM7/Makefile b/build/libraries/os/ARM7/Makefile index 06d51210..afb4df5f 100644 --- a/build/libraries/os/ARM7/Makefile +++ b/build/libraries/os/ARM7/Makefile @@ -12,8 +12,8 @@ # in whole or in part, without the prior written consent of Nintendo. # # $Date:: $ -# $Rev:$ -# $Author:$ +# $Rev$ +# $Author$ #---------------------------------------------------------------------------- SUBDIRS = @@ -21,7 +21,7 @@ SUBDIRS = #---------------------------------------------------------------------------- # build ARM & THUMB libraries -TWL_CODEGEN_ALL ?= TRUE +override TWL_CODEGEN = ALL # Codegen for sub processer TWL_PROC = ARM7 diff --git a/build/libraries/pm/ARM7/Makefile b/build/libraries/pm/ARM7/Makefile index d258ebe5..22959011 100644 --- a/build/libraries/pm/ARM7/Makefile +++ b/build/libraries/pm/ARM7/Makefile @@ -12,8 +12,8 @@ # in whole or in part, without the prior written consent of Nintendo. # # $Date:: $ -# $Rev:$ -# $Author:$ +# $Rev$ +# $Author$ #---------------------------------------------------------------------------- SUBDIRS = @@ -23,7 +23,7 @@ SUBMAKES = #---------------------------------------------------------------------------- # build ARM & THUMB libraries -TWL_CODEGEN_ALL ?= TRUE +override TWL_CODEGEN = ALL # Codegen for sub processer TWL_PROC = ARM7 diff --git a/build/libraries/pxi/ARM7/Makefile b/build/libraries/pxi/ARM7/Makefile index 09a3c37a..fb82a1e3 100644 --- a/build/libraries/pxi/ARM7/Makefile +++ b/build/libraries/pxi/ARM7/Makefile @@ -12,8 +12,8 @@ # in whole or in part, without the prior written consent of Nintendo. # # $Date:: $ -# $Rev:$ -# $Author:$ +# $Rev$ +# $Author$ #---------------------------------------------------------------------------- SUBDIRS = @@ -21,7 +21,7 @@ SUBDIRS = #---------------------------------------------------------------------------- # build ARM & THUMB libraries -TWL_CODEGEN_ALL ?= TRUE +override TWL_CODEGEN = ALL # Codegen for sub processer TWL_PROC = ARM7 diff --git a/build/libraries_sysmenu/Makefile b/build/libraries_sysmenu/Makefile index e1f3990f..69369536 100644 --- a/build/libraries_sysmenu/Makefile +++ b/build/libraries_sysmenu/Makefile @@ -34,8 +34,8 @@ SUBDIRS = reloc_info \ dht \ wds \ errorLog \ - TwlWireless \ nwm \ +# TwlWireless \ # acsign \ #---------------------------------------------------------------------------- diff --git a/build/libraries_sysmenu/boot/ARM7/Makefile b/build/libraries_sysmenu/boot/ARM7/Makefile index 926e7748..7075cc92 100644 --- a/build/libraries_sysmenu/boot/ARM7/Makefile +++ b/build/libraries_sysmenu/boot/ARM7/Makefile @@ -23,6 +23,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TWL_PROC = ARM7 +override TWL_CODEGEN = ALL #---------------------------------------------------------------------------- diff --git a/build/libraries_sysmenu/dht/ARM7/Makefile b/build/libraries_sysmenu/dht/ARM7/Makefile index ad84e31b..49a92df2 100644 --- a/build/libraries_sysmenu/dht/ARM7/Makefile +++ b/build/libraries_sysmenu/dht/ARM7/Makefile @@ -23,6 +23,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TWL_PROC = ARM7 +override TWL_CODEGEN = ALL SRCDIR = ../common/src SRCS = dht.c diff --git a/build/libraries_sysmenu/ds/ARM7/Makefile b/build/libraries_sysmenu/ds/ARM7/Makefile index c959afc0..7c86eab0 100644 --- a/build/libraries_sysmenu/ds/ARM7/Makefile +++ b/build/libraries_sysmenu/ds/ARM7/Makefile @@ -23,6 +23,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TWL_PROC = ARM7 +override TWL_CODEGEN = ALL #---------------------------------------------------------------------------- diff --git a/build/libraries_sysmenu/hotsw/ARM7/Makefile b/build/libraries_sysmenu/hotsw/ARM7/Makefile index 6638ecd0..bf76e373 100644 --- a/build/libraries_sysmenu/hotsw/ARM7/Makefile +++ b/build/libraries_sysmenu/hotsw/ARM7/Makefile @@ -23,6 +23,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TWL_PROC = ARM7 +override TWL_CODEGEN = ALL #---------------------------------------------------------------------------- diff --git a/build/libraries_sysmenu/mcu/ARM7/Makefile b/build/libraries_sysmenu/mcu/ARM7/Makefile index c2e313a0..91e79dbc 100644 --- a/build/libraries_sysmenu/mcu/ARM7/Makefile +++ b/build/libraries_sysmenu/mcu/ARM7/Makefile @@ -23,6 +23,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TWL_PROC = ARM7 +override TWL_CODEGEN = ALL #---------------------------------------------------------------------------- diff --git a/build/libraries_sysmenu/nwm/ARM7/Makefile b/build/libraries_sysmenu/nwm/ARM7/Makefile index 11b01ce4..d520b2f0 100644 --- a/build/libraries_sysmenu/nwm/ARM7/Makefile +++ b/build/libraries_sysmenu/nwm/ARM7/Makefile @@ -27,7 +27,7 @@ override TARGET_PLATFORM = TWL TWL_PROC = ARM7 # build ARM & THUMB libraries -TWL_CODEGEN ?= ALL +override TWL_CODEGEN = ALL MACRO_FLAGS = -DSDK_SYSMENU_BUILD diff --git a/build/libraries_sysmenu/reloc_info/ARM7/Makefile b/build/libraries_sysmenu/reloc_info/ARM7/Makefile index 34ef175b..ff3935aa 100644 --- a/build/libraries_sysmenu/reloc_info/ARM7/Makefile +++ b/build/libraries_sysmenu/reloc_info/ARM7/Makefile @@ -23,6 +23,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TWL_PROC = ARM7 +override TWL_CODEGEN = ALL #---------------------------------------------------------------------------- diff --git a/build/libraries_sysmenu/sysmenu/ARM7/Makefile b/build/libraries_sysmenu/sysmenu/ARM7/Makefile index f31e2433..38238e05 100644 --- a/build/libraries_sysmenu/sysmenu/ARM7/Makefile +++ b/build/libraries_sysmenu/sysmenu/ARM7/Makefile @@ -23,6 +23,7 @@ TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TWL_PROC = ARM7 +override TWL_CODEGEN = ALL SRCS_COMMON = status.c \ pxi.c \ diff --git a/build/nandfirm/menu-launcher/wram_regs/Makefile b/build/nandfirm/menu-launcher/wram_regs/Makefile index 1ed36cc3..4e9ffde9 100644 --- a/build/nandfirm/menu-launcher/wram_regs/Makefile +++ b/build/nandfirm/menu-launcher/wram_regs/Makefile @@ -12,12 +12,12 @@ # in whole or in part, without the prior written consent of Nintendo. # # $Date:: $ -# $Rev:$ -# $Author:$ +# $Rev$ +# $Author$ #---------------------------------------------------------------------------- override TARGET_PLATFORM := TWL -override TARGET_CODEGEN := ARM +override TWL_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/nandfirm/sdmc-launcher/wram_regs/Makefile b/build/nandfirm/sdmc-launcher/wram_regs/Makefile index fbe912d1..f7a40e84 100644 --- a/build/nandfirm/sdmc-launcher/wram_regs/Makefile +++ b/build/nandfirm/sdmc-launcher/wram_regs/Makefile @@ -12,12 +12,12 @@ # in whole or in part, without the prior written consent of Nintendo. # # $Date:: $ -# $Rev:$ -# $Author:$ +# $Rev$ +# $Author$ #---------------------------------------------------------------------------- override TARGET_PLATFORM := TWL -override TARGET_CODEGEN := ARM +override TWL_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/norfirm/firm-dev/wram_regs/Makefile b/build/norfirm/firm-dev/wram_regs/Makefile index 427c35a2..a55b886a 100644 --- a/build/norfirm/firm-dev/wram_regs/Makefile +++ b/build/norfirm/firm-dev/wram_regs/Makefile @@ -12,12 +12,12 @@ # in whole or in part, without the prior written consent of Nintendo. # # $Date:: $ -# $Rev:$ -# $Author:$ +# $Rev$ +# $Author$ #---------------------------------------------------------------------------- override TARGET_PLATFORM := TWL -override TARGET_CODEGEN := ARM +override TWL_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/norfirm/norfirm-empty/Makefile b/build/norfirm/norfirm-empty/Makefile index 6c5a1ae7..b60f9d11 100644 --- a/build/norfirm/norfirm-empty/Makefile +++ b/build/norfirm/norfirm-empty/Makefile @@ -17,7 +17,7 @@ #---------------------------------------------------------------------------- override TARGET_PLATFORM := TWL -override TARGET_CODEGEN := ARM +override TWL_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/norfirm/norfirm-print/wram_regs/Makefile b/build/norfirm/norfirm-print/wram_regs/Makefile index 427c35a2..a55b886a 100644 --- a/build/norfirm/norfirm-print/wram_regs/Makefile +++ b/build/norfirm/norfirm-print/wram_regs/Makefile @@ -12,12 +12,12 @@ # in whole or in part, without the prior written consent of Nintendo. # # $Date:: $ -# $Rev:$ -# $Author:$ +# $Rev$ +# $Author$ #---------------------------------------------------------------------------- override TARGET_PLATFORM := TWL -override TARGET_CODEGEN := ARM +override TWL_CODEGEN := ARM override TWL_ARCHGEN := LIMITED override TARGET_FINALROM := TRUE diff --git a/build/systemMenu_RED/DSHashTable/Makefile b/build/systemMenu_RED/DSHashTable/Makefile index ca3b9478..1300b632 100644 --- a/build/systemMenu_RED/DSHashTable/Makefile +++ b/build/systemMenu_RED/DSHashTable/Makefile @@ -19,7 +19,7 @@ TARGET_FIRM = SYSTEMMENU override TARGET_PLATFORM := TWL -override TARGET_CODEGEN := ARM +override TWL_CODEGEN := ARM override TWL_ARCHGEN := LIMITED TWL_NANDAPP = TRUE diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile index d2291359..4da7338b 100644 --- a/build/systemMenu_RED/Launcher/ARM9/Makefile +++ b/build/systemMenu_RED/Launcher/ARM9/Makefile @@ -53,7 +53,7 @@ SYSM_DISABLE_DEBUG ?= FALSE TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL -TWL_CODEGEN = ARM +TWL_CODEGEN ?= THUMB TWL_ARCHGEN = LIMITED TWL_NANDAPP = TRUE diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile index 69a4e8e9..7389c00b 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile +++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile @@ -31,6 +31,7 @@ SYSM_DISABLE_DEBUG ?= FALSE TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL +TWL_CODEGEN ?= THUMB TWL_ARCHGEN = LIMITED TWL_NANDAPP = TRUE diff --git a/build/systemMenu_tools/NandInitializerProduction/ARM7.TWL/Makefile b/build/systemMenu_tools/NandInitializerProduction/ARM7.TWL/Makefile index 9db47661..0d6f1626 100644 --- a/build/systemMenu_tools/NandInitializerProduction/ARM7.TWL/Makefile +++ b/build/systemMenu_tools/NandInitializerProduction/ARM7.TWL/Makefile @@ -21,7 +21,7 @@ override TWL_PROC = ARM7 override TWL_ARCHGEN = LIMITED ##override TWL_PLATFORM = TS TWL_NO_STD_PCHDR = True -##TWL_CODEGEN ?= ALL +override TWL_CODEGEN = ARM ifndef TWLSDK_NOCRYPTO #---------------------------------------------------------------------------- diff --git a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile index ed4c0769..24fe25c9 100644 --- a/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile +++ b/build/systemMenu_tools/NandInitializerRed/ARM7.TWL/Makefile @@ -21,7 +21,7 @@ override TWL_PROC = ARM7 override TWL_ARCHGEN = LIMITED ##override TWL_PLATFORM = TS TWL_NO_STD_PCHDR = True -##TWL_CODEGEN ?= ALL +override TWL_CODEGEN = ARM ifndef TWLSDK_NOCRYPTO #---------------------------------------------------------------------------- diff --git a/build/systemMenu_tools/SystemUpdater/ARM7.TWL/Makefile b/build/systemMenu_tools/SystemUpdater/ARM7.TWL/Makefile index 9bc51d97..90af5f70 100644 --- a/build/systemMenu_tools/SystemUpdater/ARM7.TWL/Makefile +++ b/build/systemMenu_tools/SystemUpdater/ARM7.TWL/Makefile @@ -21,7 +21,7 @@ override TWL_PROC = ARM7 override TWL_ARCHGEN = LIMITED ##override TWL_PLATFORM = TS TWL_NO_STD_PCHDR = True -##TWL_CODEGEN ?= ALL +override TWL_CODEGEN = ARM ifndef TWLSDK_NOCRYPTO #---------------------------------------------------------------------------- diff --git a/tools/bin/makerom.TWL.launcher.exe b/tools/bin/makerom.TWL.launcher.exe index b89e14bf..ce4cb6b5 100644 Binary files a/tools/bin/makerom.TWL.launcher.exe and b/tools/bin/makerom.TWL.launcher.exe differ