From 32ac52e4e2724df92efe31a64a298cc0b7d4fa8d Mon Sep 17 00:00:00 2001 From: yoshida_teruhisa Date: Tue, 15 Jul 2008 05:55:00 +0000 Subject: [PATCH] =?UTF-8?q?tests=E3=81=AE=E4=B8=8B=E3=81=A7tad=E3=82=92?= =?UTF-8?q?=E4=BD=9C=E3=82=8D=E3=81=86=E3=81=A8=E3=81=97=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=82=8BMakefile=E3=81=99=E3=81=B9=E3=81=A6=E3=81=AB=20"=20TWL?= =?UTF-8?q?=5FNANDAPP=20=3D=20TRUE=20"=20=E3=82=92=E5=85=A5=E3=82=8C?= =?UTF-8?q?=E3=82=8B?= 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@1892 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/tests/CheckPreloadParameters/Makefile | 3 +++ build/tests/RelocateChecker/ARM9/Makefile.0 | 2 ++ build/tests/RelocateChecker/ARM9/Makefile.1 | 2 ++ build/tests/RelocateChecker/ARM9/Makefile.2 | 2 ++ build/tests/RelocateChecker/ARM9/Makefile.3 | 2 ++ build/tests/RelocateChecker/ARM9/Makefile.4 | 2 ++ build/tests/RelocateChecker/ARM9/Makefile.5 | 2 ++ build/tests/RomTypeTest/ARM9/Makefile.5 | 2 ++ build/tests/RomTypeTest/ARM9/Makefile.6 | 2 ++ build/tests/RomTypeTest/ARM9/Makefile.7 | 2 ++ build/tests/RomTypeTest/ARM9/Makefile.8 | 2 ++ build/tests/RomTypeTest/ARM9/Makefile.9 | 2 ++ build/tests/RomTypeTest/ARM9/Makefile.a | 2 ++ build/tests/RomTypeTest/ARM9/Makefile.b | 2 ++ build/tests/RomTypeTest/ARM9/Makefile.c | 2 ++ build/tests/RomTypeTest/ARM9/Makefile.h | 2 ++ build/tests/RomTypeTest/ARM9/Makefile.i | 2 ++ build/tests/RomTypeTest/ARM9/Makefile.j | 2 ++ build/tests/RomTypeTest/ARM9/Makefile.k | 2 ++ build/tests/Shared2File/Makefile | 2 ++ build/tests/SimpleBenchmark/ARM9/Makefile.0 | 5 +++-- build/tests/SimpleBenchmark/ARM9/Makefile.1 | 5 +++-- build/tests/SimpleBenchmark/ARM9/src/SimpleBenchmark.c | 4 ++-- 23 files changed, 49 insertions(+), 6 deletions(-) diff --git a/build/tests/CheckPreloadParameters/Makefile b/build/tests/CheckPreloadParameters/Makefile index db4cadbd..eaac6316 100644 --- a/build/tests/CheckPreloadParameters/Makefile +++ b/build/tests/CheckPreloadParameters/Makefile @@ -15,6 +15,9 @@ # $Rev$ # $Author$ #---------------------------------------------------------------------------- + +TWL_NANDAPP = TRUE + TARGET_PLATFORM = TWL SRCS = main.c diff --git a/build/tests/RelocateChecker/ARM9/Makefile.0 b/build/tests/RelocateChecker/ARM9/Makefile.0 index 80dc7f04..ae800766 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.0 +++ b/build/tests/RelocateChecker/ARM9/Makefile.0 @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RelocateChecker/ARM9/Makefile.1 b/build/tests/RelocateChecker/ARM9/Makefile.1 index ae4e336f..cca17de5 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.1 +++ b/build/tests/RelocateChecker/ARM9/Makefile.1 @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RelocateChecker/ARM9/Makefile.2 b/build/tests/RelocateChecker/ARM9/Makefile.2 index 81192824..d855235c 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.2 +++ b/build/tests/RelocateChecker/ARM9/Makefile.2 @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RelocateChecker/ARM9/Makefile.3 b/build/tests/RelocateChecker/ARM9/Makefile.3 index fb4a469d..fdf2f0c2 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.3 +++ b/build/tests/RelocateChecker/ARM9/Makefile.3 @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RelocateChecker/ARM9/Makefile.4 b/build/tests/RelocateChecker/ARM9/Makefile.4 index 13021899..4d2e664a 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.4 +++ b/build/tests/RelocateChecker/ARM9/Makefile.4 @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RelocateChecker/ARM9/Makefile.5 b/build/tests/RelocateChecker/ARM9/Makefile.5 index ae1d7e4e..1f2e1d45 100644 --- a/build/tests/RelocateChecker/ARM9/Makefile.5 +++ b/build/tests/RelocateChecker/ARM9/Makefile.5 @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RomTypeTest/ARM9/Makefile.5 b/build/tests/RomTypeTest/ARM9/Makefile.5 index 67b81cfe..25957624 100644 --- a/build/tests/RomTypeTest/ARM9/Makefile.5 +++ b/build/tests/RomTypeTest/ARM9/Makefile.5 @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RomTypeTest/ARM9/Makefile.6 b/build/tests/RomTypeTest/ARM9/Makefile.6 index 49afc64c..9eccec93 100644 --- a/build/tests/RomTypeTest/ARM9/Makefile.6 +++ b/build/tests/RomTypeTest/ARM9/Makefile.6 @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RomTypeTest/ARM9/Makefile.7 b/build/tests/RomTypeTest/ARM9/Makefile.7 index dfd1ae72..fae03c69 100644 --- a/build/tests/RomTypeTest/ARM9/Makefile.7 +++ b/build/tests/RomTypeTest/ARM9/Makefile.7 @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RomTypeTest/ARM9/Makefile.8 b/build/tests/RomTypeTest/ARM9/Makefile.8 index 05015f7f..b1b44b6f 100644 --- a/build/tests/RomTypeTest/ARM9/Makefile.8 +++ b/build/tests/RomTypeTest/ARM9/Makefile.8 @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RomTypeTest/ARM9/Makefile.9 b/build/tests/RomTypeTest/ARM9/Makefile.9 index 22f850dd..26a85d17 100644 --- a/build/tests/RomTypeTest/ARM9/Makefile.9 +++ b/build/tests/RomTypeTest/ARM9/Makefile.9 @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RomTypeTest/ARM9/Makefile.a b/build/tests/RomTypeTest/ARM9/Makefile.a index 0b801fdd..83348305 100644 --- a/build/tests/RomTypeTest/ARM9/Makefile.a +++ b/build/tests/RomTypeTest/ARM9/Makefile.a @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RomTypeTest/ARM9/Makefile.b b/build/tests/RomTypeTest/ARM9/Makefile.b index 50bb5d55..08b8224b 100644 --- a/build/tests/RomTypeTest/ARM9/Makefile.b +++ b/build/tests/RomTypeTest/ARM9/Makefile.b @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RomTypeTest/ARM9/Makefile.c b/build/tests/RomTypeTest/ARM9/Makefile.c index 1e90cc12..f8bd7ad8 100644 --- a/build/tests/RomTypeTest/ARM9/Makefile.c +++ b/build/tests/RomTypeTest/ARM9/Makefile.c @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RomTypeTest/ARM9/Makefile.h b/build/tests/RomTypeTest/ARM9/Makefile.h index 9411919f..ad5100a2 100644 --- a/build/tests/RomTypeTest/ARM9/Makefile.h +++ b/build/tests/RomTypeTest/ARM9/Makefile.h @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RomTypeTest/ARM9/Makefile.i b/build/tests/RomTypeTest/ARM9/Makefile.i index 3c5321ee..a1a1cb33 100644 --- a/build/tests/RomTypeTest/ARM9/Makefile.i +++ b/build/tests/RomTypeTest/ARM9/Makefile.i @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RomTypeTest/ARM9/Makefile.j b/build/tests/RomTypeTest/ARM9/Makefile.j index 80c7db6c..be75d339 100644 --- a/build/tests/RomTypeTest/ARM9/Makefile.j +++ b/build/tests/RomTypeTest/ARM9/Makefile.j @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/RomTypeTest/ARM9/Makefile.k b/build/tests/RomTypeTest/ARM9/Makefile.k index 86fad6af..caf16051 100644 --- a/build/tests/RomTypeTest/ARM9/Makefile.k +++ b/build/tests/RomTypeTest/ARM9/Makefile.k @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED diff --git a/build/tests/Shared2File/Makefile b/build/tests/Shared2File/Makefile index 7bf45298..199b8d48 100644 --- a/build/tests/Shared2File/Makefile +++ b/build/tests/Shared2File/Makefile @@ -26,6 +26,8 @@ TITLEID_LO = 0S2A SRCS = main.c TARGET_BIN = shared2Test.tad +TWL_NANDAPP = TRUE + #------------------------- #-- NAND アプリではいくつかのパラメータの指定のために固有の RSF ファイルが必要です。 diff --git a/build/tests/SimpleBenchmark/ARM9/Makefile.0 b/build/tests/SimpleBenchmark/ARM9/Makefile.0 index 9574953c..fcfff216 100644 --- a/build/tests/SimpleBenchmark/ARM9/Makefile.0 +++ b/build/tests/SimpleBenchmark/ARM9/Makefile.0 @@ -28,6 +28,8 @@ WRAM_MAP_FILE = $(COMPONENT_DIR)/wram_regs/wram_regs.rbin #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED @@ -35,12 +37,11 @@ TWL_ARCHGEN = LIMITED TARGET_NUMBER = 0 TARGET_NAME = SimpleBenchmark$(TARGET_NUMBER) BINDIR = ./bin/$(TWL_BUILDTYPE)/$(TARGET_NAME) -TARGET_BIN = $(TARGET_NAME).srl +TARGET_BIN = $(TARGET_NAME).tad LCFILE_SPEC = ARM9-TS.lsf LCFILE_TEMPLATE = ARM9-TS.lcf.template TITLEID_LO = SB$(TARGET_NUMBER)A -#TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad ROM_SPEC = main$(TARGET_NUMBER).rsf diff --git a/build/tests/SimpleBenchmark/ARM9/Makefile.1 b/build/tests/SimpleBenchmark/ARM9/Makefile.1 index e1b44b91..c9ab05b9 100644 --- a/build/tests/SimpleBenchmark/ARM9/Makefile.1 +++ b/build/tests/SimpleBenchmark/ARM9/Makefile.1 @@ -20,6 +20,8 @@ SUBDIRS = #---------------------------------------------------------------------------- +TWL_NANDAPP = TRUE + TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED @@ -27,9 +29,8 @@ TWL_ARCHGEN = LIMITED TARGET_NUMBER = 1 TARGET_NAME = SimpleBenchmark$(TARGET_NUMBER) BINDIR = ./bin/$(TWL_BUILDTYPE)/$(TARGET_NAME) -TARGET_BIN = $(TARGET_NAME).srl TITLEID_LO = SB$(TARGET_NUMBER)A -#TARGET_TAD = $(BINDIR)/$(TITLEID_LO).$(TWL_BUILD_DIR)$(CODEGEN_ARCH).tad +TARGET_BIN = $(TARGET_NAME).tad ROM_SPEC = main$(TARGET_NUMBER).rsf diff --git a/build/tests/SimpleBenchmark/ARM9/src/SimpleBenchmark.c b/build/tests/SimpleBenchmark/ARM9/src/SimpleBenchmark.c index 51f3f154..568c49a1 100644 --- a/build/tests/SimpleBenchmark/ARM9/src/SimpleBenchmark.c +++ b/build/tests/SimpleBenchmark/ARM9/src/SimpleBenchmark.c @@ -48,9 +48,7 @@ void SimpleBenchmarkInit( void ) GX_DispOff(); GXS_DispOff(); - NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_WHITE ); - PutStringUTF16( 1 * 8, 0 * 8, TXT_COLOR_BLUE, (const u16 *)L"SimpleBenchmarkTest"); GetAndDrawRTCData( &g_rtcDraw, TRUE ); GXS_SetVisiblePlane( GX_PLANEMASK_BG0 ); @@ -75,6 +73,8 @@ void SimpleBenchmarkMain(void) ot = OS_GetTick(); + NNS_G2dCharCanvasClear( &gCanvas, TXT_COLOR_WHITE ); + PutStringUTF16( 1 * 8, 0 * 8, TXT_COLOR_BLUE, (const u16 *)L"SimpleBenchmarkTestSimpleBenchmarkTest"); PutStringUTF16( 1 * 8, 1 * 8, TXT_COLOR_BLUE, (const u16 *)L"SimpleBenchmarkTestSimpleBenchmarkTest"); PutStringUTF16( 1 * 8, 2 * 8, TXT_COLOR_BLUE, (const u16 *)L"SimpleBenchmarkTestSimpleBenchmarkTest"); PutStringUTF16( 1 * 8, 3 * 8, TXT_COLOR_BLUE, (const u16 *)L"SimpleBenchmarkTestSimpleBenchmarkTest");