From 329c5883f311ac94630e8f2bdb50bd15654d1c8e Mon Sep 17 00:00:00 2001
From: yosiokat <yosiokat@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Tue, 22 Apr 2008 10:31:42 +0000
Subject: [PATCH] =?UTF-8?q?SystemUpdater=E3=81=AE=E3=81=9F=E3=82=81?=
 =?UTF-8?q?=E3=81=AE=E3=83=A9=E3=83=B3=E3=83=81=E3=83=A3=E3=83=BC=E3=80=81?=
 =?UTF-8?q?=E6=9C=AC=E4=BD=93=E8=A8=AD=E5=AE=9A=E3=81=AA=E3=81=A9=E3=81=AE?=
 =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=B9=E3=82=A4=E3=83=83=E3=83=81?=
 =?UTF-8?q?=E5=88=B6=E5=BE=A1=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@1220 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 build/systemMenu_RED/Launcher/ARM9/Makefile   |  9 +++--
 .../MachineSettings/ARM9/Makefile             |  4 +--
 .../SystemUpdater/ARM9.TWL/Makefile           | 36 ++++++++++++++++---
 .../SystemUpdater/ARM9.TWL/main.rsf           |  5 +++
 4 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile
index 710a1739..ae81d60c 100644
--- a/build/systemMenu_RED/Launcher/ARM9/Makefile
+++ b/build/systemMenu_RED/Launcher/ARM9/Makefile
@@ -29,6 +29,8 @@ SUBDIRS					=	\
 
 #----------------------------------------------------------------------------
 
+ifneq ($(UPDATER_RELEASE),TRUE)
+
 # COMPILE SWITCH　※最終ROM作成時は、全てFALSEにセットする。SUBDIRのビルド時にも影響するようexportで環境変数設定する。
 export DO_NOT_SHOW_LAUNCHER	=	FALSE
 export DISABLE_WDS_SCAN		=	TRUE
@@ -38,9 +40,12 @@ export DISABLE_SLEEP		=	TRUE
 # COMPILE SWITCH ※最終ROM作成時は、全てTRUEにセットする
 export LOAD_APP_VIA_WRAM	=	FALSE
 
+endif
+
 # MAKEROM SWITCH ※最終ROM作成時は、全てTRUEにセットする
-DISABLE_DEBUG			=	FALSE
-ENABLE_AES				=	FALSE
+DISABLE_DEBUG			?=	FALSE
+ENABLE_AES				?=	FALSE
+
 
 TARGET_FIRM				=	SYSTEMMENU
 TARGET_PLATFORM			=	TWL
diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile
index d1b874f9..b6f19180 100644
--- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile
+++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile
@@ -22,8 +22,8 @@ SUBDIRS					=	\
 
 #----------------------------------------------------------------------------
 
-// MAKEROM SWITCH ※最終ROM作成時は、TRUEにする
-DISABLE_DEBUG			=	FALSE
+# MAKEROM SWITCH ※最終ROM作成時は、TRUEにする
+DISABLE_DEBUG			?=	FALSE
 
 TARGET_FIRM				=	SYSTEMMENU
 TARGET_PLATFORM			=	TWL
diff --git a/build/systemMenu_RED/SystemUpdater/ARM9.TWL/Makefile b/build/systemMenu_RED/SystemUpdater/ARM9.TWL/Makefile
index 53c50cee..a1140bb3 100644
--- a/build/systemMenu_RED/SystemUpdater/ARM9.TWL/Makefile
+++ b/build/systemMenu_RED/SystemUpdater/ARM9.TWL/Makefile
@@ -16,11 +16,37 @@
 # $Author$
 #----------------------------------------------------------------------------
 
-SUBDIRS		=
+SUBDIRS		=	$(LAUNCHER_DIR) \
+				$(MACHINESETTINGS_DIR) \
+				$(WLANFIRM_DIR)
 
 
 #----------------------------------------------------------------------------
 
+#============================================================================
+
+LAUNCHER_DIR				=	../../Launcher
+MACHINESETTINGS_DIR			=	../../MachineSettings
+WLANFIRM_DIR				=	../../wlanfirm
+
+
+# COMPILE SWITCH　for build SystemMenu
+
+export UPDATER_RELEASE		=	TRUE
+
+export DO_NOT_SHOW_LAUNCHER	=	TRUE
+export DISABLE_WDS_SCAN		=	TRUE
+export DISABLE_WLFIRM_LOAD	=	FALSE
+export DISABLE_SLEEP		=	TRUE
+export LOAD_APP_VIA_WRAM	=	FALSE
+
+# MAKEROM SWITCH for build SystemMenu
+export DISABLE_DEBUG		=	TRUE
+export ENABLE_AES			=	TRUE
+
+
+#============================================================================
+
 #============================================================================
 #現時点で製品鍵を使った書き込みが行えてはダメなので、デフォルトOFFにしておいてください。
 #USE_PRODUCT_KEY			=	TRUE
@@ -75,7 +101,9 @@ endif
 endif
 
 MAKEROM_FLAGS			+=	-DTITLEID_LO='$(TITLEID_LO)' \
-							-DPRIVKEY_PATH='$(TWL_KEYSDIR)/rsa'
+							-DPRIVKEY_PATH='$(TWL_KEYSDIR)/rsa' \
+							-DCARD_REGION='$(CARD_REGION)' \
+							-DDISABLE_DEBUG='$(DISABLE_DEBUG)'
 MAKETAD_FLAGS			+=	-s
 
 LLIBRARIES		+=	libes$(TWL_LIBSUFFIX).a				\
@@ -94,8 +122,8 @@ MAKEROM			 = $(TWL_TOOLSDIR)/bin/makerom.TWL.secure.exe
 
 GLIBRARIES		:= $(filter-out libcrypto$(TWL_LIBSUFFIX).a,$(GLIBRARIES))
 
-#LDIRT_CLEAN				=
-#INSTALL_TARGETS			=
+#LDIRT_CLEAN			=
+#INSTALL_TARGETS		=
 INSTALL_DIR				=	$(SDK_NMENU_DATADIR)
 
 #----------------------------------------------------------------------------
diff --git a/build/systemMenu_RED/SystemUpdater/ARM9.TWL/main.rsf b/build/systemMenu_RED/SystemUpdater/ARM9.TWL/main.rsf
index 8127a2c8..8deaf3b6 100644
--- a/build/systemMenu_RED/SystemUpdater/ARM9.TWL/main.rsf
+++ b/build/systemMenu_RED/SystemUpdater/ARM9.TWL/main.rsf
@@ -153,6 +153,11 @@ Property
 	#
 	CodecMode		$(MAKEROM_CODEC_MODE)
 
+	#
+	# DisableDebug	：最終ROMでは、実行時にデバッグできないようにTRUEにする必要があります。
+	#
+	DisableDebug	$(DISABLE_DEBUG)
+
 	###
 	#### END
 }