From cf59cc07218042ec3f0d8cadf8ad223a8e8ba41a Mon Sep 17 00:00:00 2001 From: yosiokat Date: Wed, 31 Oct 2007 00:16:06 +0000 Subject: [PATCH] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E6=A7=8B=E6=88=90?= =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4=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@77 b08762b0-b915-fc4b-9d8c-17b2551a87ff --- build/buildtools/commondefs | 4 ++-- build/buildtools/modulerules | 4 ++-- build/libraries_sysmenu/Makefile | 8 +++++--- build/libraries_sysmenu/acsign/ARM9/Makefile | 5 +++-- build/libraries_sysmenu/acsign/Makefile | 8 +++++--- build/libraries_sysmenu/mb_loader/ARM7/Makefile | 5 +++-- build/libraries_sysmenu/mb_loader/ARM9/Makefile | 5 +++-- build/libraries_sysmenu/mb_loader/Makefile | 7 ++++--- build/libraries_sysmenu/sysmenu/ARM9/Makefile | 5 +++-- build/libraries_sysmenu/sysmenu/Makefile | 8 +++++--- build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile | 5 +++-- build/systemMenu_RED/Launcher/ARM9/Makefile | 5 +++-- build/systemMenu_RED/MachineSettings/ARM9/Makefile | 5 +++-- build/systemMenu_RED/PictoChat/ARM9/Makefile | 5 +++-- 14 files changed, 47 insertions(+), 32 deletions(-) diff --git a/build/buildtools/commondefs b/build/buildtools/commondefs index 4c25e95f..d091bed7 100644 --- a/build/buildtools/commondefs +++ b/build/buildtools/commondefs @@ -20,9 +20,9 @@ TWL_IPL_COMMONDEFS_ = TRUE ifeq ($(TARGET_FIRM),SYSTEMMENU) -include commondefs.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/commondefs.sysmenu else -include commondefs.firm +include $(TWLIPL_ROOT)/build/buildtools/commondefs.firm endif #---------------------------------------------------------------------------- diff --git a/build/buildtools/modulerules b/build/buildtools/modulerules index c36b39e1..e6a51890 100644 --- a/build/buildtools/modulerules +++ b/build/buildtools/modulerules @@ -22,9 +22,9 @@ ifndef TWL_IPL_MODULERULES_ # ifeq ($(TARGET_FIRM),SYSTEMMENU) -include modulerules.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/modulerules.sysmenu else -include modulerules.firm +include $(TWLIPL_ROOT)/build/buildtools/modulerules.firm endif diff --git a/build/libraries_sysmenu/Makefile b/build/libraries_sysmenu/Makefile index 7d9f58a8..28431155 100644 --- a/build/libraries_sysmenu/Makefile +++ b/build/libraries_sysmenu/Makefile @@ -16,15 +16,17 @@ # $Author: kitase_hirotake $ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs.sysmenu +TARGET_FIRM = SYSTEMMENU + +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- -SUBDIRS = sysmenu mb_loader acsign +SUBDIRS = sysmenu mb_loader acsign #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/acsign/ARM9/Makefile b/build/libraries_sysmenu/acsign/ARM9/Makefile index 655cd1b8..f9213837 100644 --- a/build/libraries_sysmenu/acsign/ARM9/Makefile +++ b/build/libraries_sysmenu/acsign/ARM9/Makefile @@ -22,6 +22,7 @@ SUBDIRS = #---------------------------------------------------------------------------- +TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TWL_PROC = ARM9 @@ -34,7 +35,7 @@ SRCS = acsign.c acmemory.c acsign_util.c TARGET_LIB = libacsign$(TWL_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) @@ -50,7 +51,7 @@ CCFLAGS += -DSMALL_CODE_SIZE \ do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/acsign/Makefile b/build/libraries_sysmenu/acsign/Makefile index f337ebc1..665c3ecd 100644 --- a/build/libraries_sysmenu/acsign/Makefile +++ b/build/libraries_sysmenu/acsign/Makefile @@ -16,14 +16,16 @@ # $Author: yada $ #---------------------------------------------------------------------------- -SUBDIRS = ARM9 +SUBDIRS = ARM9 -include $(TWLIPL_ROOT)/build/buildtools/commondefs.sysmenu +TARGET_FIRM = SYSTEMMENU + +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/mb_loader/ARM7/Makefile b/build/libraries_sysmenu/mb_loader/ARM7/Makefile index 29851ff4..c678ae77 100644 --- a/build/libraries_sysmenu/mb_loader/ARM7/Makefile +++ b/build/libraries_sysmenu/mb_loader/ARM7/Makefile @@ -19,6 +19,7 @@ SUBDIRS = #---------------------------------------------------------------------------- +TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TWL_PROC = ARM7 @@ -36,7 +37,7 @@ SRCS = mb_loader.c TARGET_LIB = libmbloader_sp$(TWL_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) @@ -45,7 +46,7 @@ INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/mb_loader/ARM9/Makefile b/build/libraries_sysmenu/mb_loader/ARM9/Makefile index 1a1a806f..257cddcd 100644 --- a/build/libraries_sysmenu/mb_loader/ARM9/Makefile +++ b/build/libraries_sysmenu/mb_loader/ARM9/Makefile @@ -19,6 +19,7 @@ SUBDIRS = #---------------------------------------------------------------------------- +TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TWL_PROC = ARM9 @@ -35,7 +36,7 @@ SRCS = mb_loader.c TARGET_LIB = libmbloader$(TWL_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) @@ -44,7 +45,7 @@ INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/mb_loader/Makefile b/build/libraries_sysmenu/mb_loader/Makefile index c1ae0af0..6024cf88 100644 --- a/build/libraries_sysmenu/mb_loader/Makefile +++ b/build/libraries_sysmenu/mb_loader/Makefile @@ -16,14 +16,15 @@ # $Author: yada $ #---------------------------------------------------------------------------- -SUBDIRS = ARM7 ARM9 +TARGET_FIRM = SYSTEMMENU +SUBDIRS = ARM7 ARM9 -include $(TWLIPL_ROOT)/build/buildtools/commondefs.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build: $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/libraries_sysmenu/sysmenu/ARM9/Makefile b/build/libraries_sysmenu/sysmenu/ARM9/Makefile index ef7b3789..41d35031 100644 --- a/build/libraries_sysmenu/sysmenu/ARM9/Makefile +++ b/build/libraries_sysmenu/sysmenu/ARM9/Makefile @@ -21,6 +21,7 @@ SUBDIRS = MYSUBDIRS = ./ #---------------------------------------------------------------------------- +TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED TWL_PROC = ARM9 @@ -31,7 +32,7 @@ SRCS = sysmenu_lib.c sysmenu_card.c sysmenu_util.c gameBoot.c ninLogoFunc.c cm TARGET_LIB = libsysmenu$(TWL_LIBSUFFIX).a -include $(TWLIPL_ROOT)/build/buildtools/commondefs.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/commondefs INSTALL_TARGETS = $(TARGETS) INSTALL_DIR = $(SYSMENU_INSTALL_LIBDIR) @@ -43,7 +44,7 @@ LINCLUDES = $(TWLSDK_ROOT)/build/libraries/mb/common/include \ do-build: $(MYSUBDIRS) $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/modulerules $(MYSUBDIRS):: diff --git a/build/libraries_sysmenu/sysmenu/Makefile b/build/libraries_sysmenu/sysmenu/Makefile index f5ba9913..52c5a13b 100644 --- a/build/libraries_sysmenu/sysmenu/Makefile +++ b/build/libraries_sysmenu/sysmenu/Makefile @@ -16,16 +16,18 @@ # $Author: kitase_hirotake $ #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/commondefs.sysmenu +TARGET_FIRM = SYSTEMMENU + +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- -SUBDIRS = ARM9 +SUBDIRS = ARM9 #---------------------------------------------------------------------------- -include $(TWLIPL_ROOT)/build/buildtools/modulerules.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/modulerules #===== End of Makefile ===== diff --git a/build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile b/build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile index 74b09d1a..bd252c88 100644 --- a/build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile +++ b/build/systemMenu_RED/DS_DownloadPlay/ARM9/Makefile @@ -20,6 +20,7 @@ SUBDIRS = #---------------------------------------------------------------------------- +TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED @@ -37,14 +38,14 @@ LLIBRARY_DIRS = LLIBRARIES = LDEPENDS_NEF = -include $(TWLIPL_ROOT)/build/buildtools/commondefs.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build : $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- diff --git a/build/systemMenu_RED/Launcher/ARM9/Makefile b/build/systemMenu_RED/Launcher/ARM9/Makefile index 0cd1a08c..bab24606 100644 --- a/build/systemMenu_RED/Launcher/ARM9/Makefile +++ b/build/systemMenu_RED/Launcher/ARM9/Makefile @@ -20,6 +20,7 @@ SUBDIRS = #---------------------------------------------------------------------------- +TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED @@ -39,14 +40,14 @@ LINCLUDES = $(SRCDIR)/$(LOGO_DIR) #LLIBRARIES = #LDEPENDS_NEF = -include $(TWLIPL_ROOT)/build/buildtools/commondefs.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build : $(FONT_OBJS) $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- diff --git a/build/systemMenu_RED/MachineSettings/ARM9/Makefile b/build/systemMenu_RED/MachineSettings/ARM9/Makefile index d6497f5f..b8c9625f 100644 --- a/build/systemMenu_RED/MachineSettings/ARM9/Makefile +++ b/build/systemMenu_RED/MachineSettings/ARM9/Makefile @@ -20,6 +20,7 @@ SUBDIRS = #---------------------------------------------------------------------------- +TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED @@ -41,14 +42,14 @@ LINCLUDES = $(MISC_DIR) #LLIBRARIES = #LDEPENDS_NEF = -include $(TWLIPL_ROOT)/build/buildtools/commondefs.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build : $(FONT_OBJS) $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/modulerules #---------------------------------------------------------------------------- diff --git a/build/systemMenu_RED/PictoChat/ARM9/Makefile b/build/systemMenu_RED/PictoChat/ARM9/Makefile index d0d9a7d7..4a6de538 100644 --- a/build/systemMenu_RED/PictoChat/ARM9/Makefile +++ b/build/systemMenu_RED/PictoChat/ARM9/Makefile @@ -20,6 +20,7 @@ SUBDIRS = #---------------------------------------------------------------------------- +TARGET_FIRM = SYSTEMMENU TARGET_PLATFORM = TWL TWL_ARCHGEN = LIMITED @@ -38,14 +39,14 @@ LINCLUDES = $(MISC_DIR) #LLIBRARIES = #LDEPENDS_NEF = -include $(TWLIPL_ROOT)/build/buildtools/commondefs.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- do-build : $(FONT_OBJS) $(TARGETS) -include $(TWLIPL_ROOT)/build/buildtools/modulerules.sysmenu +include $(TWLIPL_ROOT)/build/buildtools/modulerules #----------------------------------------------------------------------------