From 8470e0b27515d1969d70e004cd7b59d0bc911120 Mon Sep 17 00:00:00 2001 From: nakasima Date: Thu, 29 Jan 2009 01:16:07 +0000 Subject: [PATCH] =?UTF-8?q?VPATH=3D$(SRCDIR)=E3=81=A7=E6=84=8F=E5=9B=B3?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E3=82=AA=E3=83=96?= =?UTF-8?q?=E3=82=B8=E3=82=A7=E3=82=AF=E3=83=88=E3=83=95=E3=82=A1=E3=82=A4?= =?UTF-8?q?=E3=83=AB=E3=81=BE=E3=81=A7=E5=8F=82=E7=85=A7=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E3=82=88=E3=81=86=E3=81=AA=E3=81=AE?= =?UTF-8?q?=E3=81=A7vpath=E3=81=A7=E3=82=BD=E3=83=BC=E3=82=B9=E3=82=92?= =?UTF-8?q?=E5=80=8B=E5=88=A5=E3=81=AB=E6=8C=87=E5=AE=9A=20=EF=BC=88?= =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=82=82=E8=8B=A5=E5=B9=B2=E9=80=9F?= =?UTF-8?q?=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=9F=E6=A8=A1=E6=A7=98=EF=BC=89?= =?UTF-8?q?=E3=80=82=20=E5=88=86=E3=81=8B=E3=82=8A=E3=81=AB=E3=81=8F?= =?UTF-8?q?=E3=81=84=E3=81=9F=E3=82=81.axf=E3=81=AE=E3=83=AB=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E3=82=92modulerules.cctype.RVCT=E3=81=B8=E7=A7=BB?= =?UTF-8?q?=E5=8B=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_firmware@228 b871894f-2f95-9b40-918c-086798483c85 --- trunk/build/buildtools/modulerules | 8 ++++++-- .../build/buildtools/modulerules.add-ins.firm | 16 +--------------- trunk/build/buildtools/modulerules.cctype.RVCT | 18 +++++++++++------- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/trunk/build/buildtools/modulerules b/trunk/build/buildtools/modulerules index d5959b9..ef3cd7f 100644 --- a/trunk/build/buildtools/modulerules +++ b/trunk/build/buildtools/modulerules @@ -3,7 +3,7 @@ # Project: CtrFirm - modulerules - common rules for build system # File: modulerules # -# Copyright 2008 Nintendo. All rights reserved. +# Copyright 2008-2009 Nintendo. All rights reserved. # # These coded instructions, statements, and computer programs contain # proprietary information of Nintendo of America Inc. and/or Nintendo @@ -24,7 +24,11 @@ ifndef CTRSDK_MODULERULES_ ifneq ($(CTR_FORCE_BUILD),) -VPATH = $(SRCDIR) +#VPATH = $(SRCDIR) +vpath %.c $(SRCDIR) +vpath %.cpp $(SRCDIR) +vpath %.cxx $(SRCDIR) +vpath %.s $(SRCDIR) SSRCFILES = $(addprefix $(OBJDIR)/,$(notdir $(SRCS))) ASRCFILES = $(addprefix $(OBJDIR)/,$(notdir $(SRCS_AUTOLOAD))) diff --git a/trunk/build/buildtools/modulerules.add-ins.firm b/trunk/build/buildtools/modulerules.add-ins.firm index 38b2954..c8950d0 100644 --- a/trunk/build/buildtools/modulerules.add-ins.firm +++ b/trunk/build/buildtools/modulerules.add-ins.firm @@ -3,7 +3,7 @@ # Project: CtrFirm - modulerules - common rules for build system # File: modulerules # -# Copyright 2008 Nintendo. All rights reserved. +# Copyright 2008-2009 Nintendo. All rights reserved. # # These coded instructions, statements, and computer programs contain # proprietary information of Nintendo of America Inc. and/or Nintendo @@ -38,20 +38,6 @@ firmdbg: @$(MAKE) -C $(TWLSDK_ROOT)/build/libraries/os @+$(REMAKE) -# .axf -$(BINDIR)/$(TARGET_BIN_BASENAME).axf: $(OBJS) $(LCFILE) $(MAKEFILE) $(LDEPENDS_NEF) $(EDEPENDS_NEF) $(ALIBRARIES) $(LDRES_FILE) $(CW_LIBCXX) -ifeq ($(CTR_CCTYPE),RVCT) - $(LD) $(LDFLAGS) $(LIBRARY_DIRS) -o $@ $(GLIBRARIES) $(OBJS) -else - $(LD) $(LDFLAGS) $(LIBRARY_DIRS) @$(LDRES_FILE) $(LCFILE) -o $@ -ifeq ($(TWL_PLATFORM),TS) - cp $(BINDIR)/$(TARGET_BIN_BASENAME).axf $(BINDIR)/$(TARGET_BIN_BASENAME).nef -endif -ifdef FIRM_STRIP_AXF - $(OBJCOPY) $@ $(BINDIR)/$(TARGET_BIN_BASENAME).sbin -endif -endif - #---------------------------------------------------------------------------- TWLSDK_MODULERULES_ = TRUE endif # TWLSDK_MODULERULES_ diff --git a/trunk/build/buildtools/modulerules.cctype.RVCT b/trunk/build/buildtools/modulerules.cctype.RVCT index df0e673..7beee74 100644 --- a/trunk/build/buildtools/modulerules.cctype.RVCT +++ b/trunk/build/buildtools/modulerules.cctype.RVCT @@ -124,13 +124,17 @@ endif endif -# .nef -ifndef USE_MY_RULE_NEF -$(BINDIR)/$(TARGET_BIN_BASENAME).nef: $(OBJS) $(MAKEFILE) $(LDEPENDS_NEF) $(LDRES_FILE) $(ALIBRARIES) -# $(LD) $(LDFLAGS) -T $(LCFILE) -LSF $(LCFILE_SPEC) -Map $@.xMAP $(LIBRARY_DIRS) @$(LDRES_FILE) -o $@ - $(LD) $(LDFLAGS) -T $(LCFILE) -Map $@.xMAP $(LIBRARY_DIRS) @$(LDRES_FILE) -o $@ -ifdef COMPSTATIC_CMDS - $(COMPSTATIC) $(COMPSTATIC_CMDS) $(COMPSTATIC_FLAGS) -f $(BINDIR)/component.files $(CTR_STDOUT) +# .axf +$(BINDIR)/$(TARGET_BIN_BASENAME).axf: $(OBJS) $(LCFILE) $(MAKEFILE) $(LDEPENDS_NEF) $(EDEPENDS_NEF) $(ALIBRARIES) $(LDRES_FILE) $(CW_LIBCXX) +ifeq ($(CTR_CCTYPE),RVCT) + $(LD) $(LDFLAGS) $(LIBRARY_DIRS) -o $@ $(GLIBRARIES) $(OBJS) +else + $(LD) $(LDFLAGS) $(LIBRARY_DIRS) @$(LDRES_FILE) $(LCFILE) -o $@ +ifeq ($(TWL_PLATFORM),TS) + cp $(BINDIR)/$(TARGET_BIN_BASENAME).axf $(BINDIR)/$(TARGET_BIN_BASENAME).nef +endif +ifdef FIRM_STRIP_AXF + $(OBJCOPY) $@ $(BINDIR)/$(TARGET_BIN_BASENAME).sbin endif endif