diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile index 99c2c913..d9c7b40a 100644 --- a/build/systemMenu_RED/Launcher/ARM9/Makefile +++ b/build/systemMenu_RED/Launcher/ARM9/Makefile @@ -90,8 +90,7 @@ endif ifneq ($(DHT_TEST),) MACRO_FLAGS += -DDHT_TEST -MAKEROM_FLAGS += -DDS_HASH_TABLE_FILE=DSHashTable.bin \ - -DDS_HASH_TABLE_DIR=$(TWL_IPL_RED_PRIVATE_ROOT)/build/tools/MakeDSHashTable +MAKEROM_FLAGS += -DDS_HASH_TABLE_FILE=DSHashTable.bin else MAKEROM_FLAGS += -DDS_HASH_TABLE_DIR=data endif diff --git a/build/systemMenu_RED/Launcher/ARM9/main.rsf b/build/systemMenu_RED/Launcher/ARM9/main.rsf index 5be98de5..0504c370 100644 --- a/build/systemMenu_RED/Launcher/ARM9/main.rsf +++ b/build/systemMenu_RED/Launcher/ARM9/main.rsf @@ -213,7 +213,6 @@ RomSpec HostRoot ../../data Root /data File NTR_IPL_font_m.NFTR NoCardBanner.bnr EmptyBanner.bnr NoBanner.bnr fanfare.32.wav - HostRoot $(DS_HASH_TABLE_DIR) Root /sign File $(DS_HASH_TABLE_FILE) } \ No newline at end of file diff --git a/build/tests/CheckDSHashTable/CheckDSHashTable.rsf b/build/tests/CheckDSHashTable/CheckDSHashTable.rsf index 8b3e3892..72f07af4 100644 --- a/build/tests/CheckDSHashTable/CheckDSHashTable.rsf +++ b/build/tests/CheckDSHashTable/CheckDSHashTable.rsf @@ -234,7 +234,7 @@ RomSpec { Offset 0x00000000 Segment ALL - HostRoot $(MAKEROM_DTH_ROOT) + HostRoot ../../systemMenu_RED/data Root /sign File DSHashTable.bin HostRoot $(MAKEROM_SRL_ROOT) diff --git a/build/tests/CheckDSHashTable/Makefile b/build/tests/CheckDSHashTable/Makefile index b88e3a15..285af9a5 100644 --- a/build/tests/CheckDSHashTable/Makefile +++ b/build/tests/CheckDSHashTable/Makefile @@ -28,17 +28,11 @@ SRCS = main.c TARGET_BIN = CheckDSHashTable.srl ROM_SPEC = CheckDSHashTable.rsf -ifeq ($(TWL_IPL_RED_PRIVATE_ROOT),) -DS_HASH_TABLE_ROOT = data -else -DS_HASH_TABLE_ROOT = $(TWL_IPL_RED_PRIVATE_ROOT)/build/tools/MakeDSHashTable -endif DS_HASH_TABLE_SRL_ROOT ?= D:/SRL include $(TWL_IPL_RED_ROOT)/build/buildtools/commondefs -MAKEROM_FLAGS += -DMAKEROM_DTH_ROOT=$(DS_HASH_TABLE_ROOT) \ - -DMAKEROM_SRL_ROOT=$(DS_HASH_TABLE_SRL_ROOT) +MAKEROM_FLAGS += -DMAKEROM_SRL_ROOT=$(DS_HASH_TABLE_SRL_ROOT) #----------------------------------------------------------------------------