diff --git a/build/buildtools/commondefs b/build/buildtools/commondefs index b8256f6e..bea7622e 100644 --- a/build/buildtools/commondefs +++ b/build/buildtools/commondefs @@ -33,6 +33,7 @@ endif ifneq ($(TWL_IPL_RED_PRIVATE_ROOT),) TWL_KEYSDIR := $(TWL_IPL_RED_PRIVATE_ROOT)/keys +TWL_IPL_RED_PRIVATE_TOOLSDIR = $(call eupath,$(TWL_IPL_RED_PRIVATE_ROOT)/tools) endif MAKEROM_FLAGS += -s diff --git a/build/buildtools/commondefs.firm b/build/buildtools/commondefs.firm index 7c782b6b..b6ec6aae 100644 --- a/build/buildtools/commondefs.firm +++ b/build/buildtools/commondefs.firm @@ -97,9 +97,9 @@ FIRM_LIBS ?= $(addsuffix $(FIRM_LIBSUFFIX).a,$(FIRM_LIBS_BASE)) #---------------------------------------------------------------------------- # MY BUILD TOOLS # -MAKENORFIRM := $(FIRM_TOOLSDIR)/bin/makenorfirm.exe -MAKENANDFIRM := $(FIRM_TOOLSDIR)/bin/makenandfirm.exe -MAKEGCDFIRM := $(FIRM_TOOLSDIR)/bin/makegcdfirm.exe +MAKENORFIRM = $(TWL_IPL_RED_PRIVATE_TOOLSDIR)/bin/makenorfirm.exe +MAKENANDFIRM = $(TWL_IPL_RED_PRIVATE_TOOLSDIR)/bin/makenandfirm.exe +MAKEGCDFIRM = $(TWL_IPL_RED_PRIVATE_TOOLSDIR)/bin/makegcdfirm.exe NTEXCONV := $(ROOT)/tools/bin/ntexconv.exe MAKEBANNER := $(TWL_TOOLSDIR)/bin/makebanner.TWL.exe diff --git a/build/buildtools/commondefs.sysmenu b/build/buildtools/commondefs.sysmenu index 77eac772..3554729b 100644 --- a/build/buildtools/commondefs.sysmenu +++ b/build/buildtools/commondefs.sysmenu @@ -54,7 +54,7 @@ SYSMENU_INCDIR := $(SYSMENU_ROOT)/include \ SYSMENU_TOOLSDIR := $(SYSMENU_ROOT)/tools SYSMENU_COMPONENTSDIR := $(SYSMENU_ROOT)/components -SYSMENU_ROM_HEADER_DIR = $(SYSMENU_ROOT)/RomHeader/ +SYSMENU_ROM_HEADER_DIR = $(SYSMENU_ROOT)/RomHeader LDEPENDS_LCF += $(SYSMENU_BUILDTOOLSDIR)/commondefs.sysmenu diff --git a/build/systemMenu_tools/SystemUpdater/data/Makefile b/build/systemMenu_tools/SystemUpdater/data/Makefile index e9f5736a..528653b5 100644 --- a/build/systemMenu_tools/SystemUpdater/data/Makefile +++ b/build/systemMenu_tools/SystemUpdater/data/Makefile @@ -24,7 +24,7 @@ include $(SYSMENU_ROOT)/build/systemMenu_RED/DSHashTable/commondefs.DSHashTable include $(SYSMENU_ROOT)/build/systemMenu_RED/sysmenuVersion/commondefs.sysmenuVersion # SystemUpdaterでインポートするTADは専用のmaketadでTAD化します。 -MAKETAD := $(SYSMENU_TOOLSDIR)/bin/maketad.updater.exe +MAKETAD := $(TWL_IPL_RED_PRIVATE_TOOLSDIR)/bin/maketad.updater.exe MAKETAD_OPTION += -s diff --git a/tools/bin/makegcdfirm.exe b/tools/bin/makegcdfirm.exe deleted file mode 100644 index 8eef6f56..00000000 Binary files a/tools/bin/makegcdfirm.exe and /dev/null differ diff --git a/tools/bin/makenandfirm.exe b/tools/bin/makenandfirm.exe deleted file mode 100644 index 8406d128..00000000 Binary files a/tools/bin/makenandfirm.exe and /dev/null differ diff --git a/tools/bin/makenorfirm.exe b/tools/bin/makenorfirm.exe deleted file mode 100644 index b6bdbad7..00000000 Binary files a/tools/bin/makenorfirm.exe and /dev/null differ diff --git a/tools/bin/maketad.updater.exe b/tools/bin/maketad.updater.exe deleted file mode 100755 index b9a92ed7..00000000 Binary files a/tools/bin/maketad.updater.exe and /dev/null differ