mirror of
https://github.com/rvtr/ctr_firmware.git
synced 2025-10-31 07:51:08 -04:00
VPATH=$(SRCDIR)で意図していないオブジェクトファイルまで参照されていたようなのでvpathでソースを個別に指定
(ビルドも若干速くなった模様)。 分かりにくいため.axfのルールをmodulerules.cctype.RVCTへ移動。 git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_firmware@228 b871894f-2f95-9b40-918c-086798483c85
This commit is contained in:
parent
7532eb6e65
commit
8470e0b275
@ -3,7 +3,7 @@
|
|||||||
# Project: CtrFirm - modulerules - common rules for build system
|
# Project: CtrFirm - modulerules - common rules for build system
|
||||||
# File: modulerules
|
# File: modulerules
|
||||||
#
|
#
|
||||||
# Copyright 2008 Nintendo. All rights reserved.
|
# Copyright 2008-2009 Nintendo. All rights reserved.
|
||||||
#
|
#
|
||||||
# These coded instructions, statements, and computer programs contain
|
# These coded instructions, statements, and computer programs contain
|
||||||
# proprietary information of Nintendo of America Inc. and/or Nintendo
|
# proprietary information of Nintendo of America Inc. and/or Nintendo
|
||||||
@ -24,7 +24,11 @@ ifndef CTRSDK_MODULERULES_
|
|||||||
|
|
||||||
ifneq ($(CTR_FORCE_BUILD),)
|
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)))
|
SSRCFILES = $(addprefix $(OBJDIR)/,$(notdir $(SRCS)))
|
||||||
ASRCFILES = $(addprefix $(OBJDIR)/,$(notdir $(SRCS_AUTOLOAD)))
|
ASRCFILES = $(addprefix $(OBJDIR)/,$(notdir $(SRCS_AUTOLOAD)))
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
# Project: CtrFirm - modulerules - common rules for build system
|
# Project: CtrFirm - modulerules - common rules for build system
|
||||||
# File: modulerules
|
# File: modulerules
|
||||||
#
|
#
|
||||||
# Copyright 2008 Nintendo. All rights reserved.
|
# Copyright 2008-2009 Nintendo. All rights reserved.
|
||||||
#
|
#
|
||||||
# These coded instructions, statements, and computer programs contain
|
# These coded instructions, statements, and computer programs contain
|
||||||
# proprietary information of Nintendo of America Inc. and/or Nintendo
|
# proprietary information of Nintendo of America Inc. and/or Nintendo
|
||||||
@ -38,20 +38,6 @@ firmdbg:
|
|||||||
@$(MAKE) -C $(TWLSDK_ROOT)/build/libraries/os
|
@$(MAKE) -C $(TWLSDK_ROOT)/build/libraries/os
|
||||||
@+$(REMAKE)
|
@+$(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
|
TWLSDK_MODULERULES_ = TRUE
|
||||||
endif # TWLSDK_MODULERULES_
|
endif # TWLSDK_MODULERULES_
|
||||||
|
|||||||
@ -124,13 +124,17 @@ endif
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
# .nef
|
# .axf
|
||||||
ifndef USE_MY_RULE_NEF
|
$(BINDIR)/$(TARGET_BIN_BASENAME).axf: $(OBJS) $(LCFILE) $(MAKEFILE) $(LDEPENDS_NEF) $(EDEPENDS_NEF) $(ALIBRARIES) $(LDRES_FILE) $(CW_LIBCXX)
|
||||||
$(BINDIR)/$(TARGET_BIN_BASENAME).nef: $(OBJS) $(MAKEFILE) $(LDEPENDS_NEF) $(LDRES_FILE) $(ALIBRARIES)
|
ifeq ($(CTR_CCTYPE),RVCT)
|
||||||
# $(LD) $(LDFLAGS) -T $(LCFILE) -LSF $(LCFILE_SPEC) -Map $@.xMAP $(LIBRARY_DIRS) @$(LDRES_FILE) -o $@
|
$(LD) $(LDFLAGS) $(LIBRARY_DIRS) -o $@ $(GLIBRARIES) $(OBJS)
|
||||||
$(LD) $(LDFLAGS) -T $(LCFILE) -Map $@.xMAP $(LIBRARY_DIRS) @$(LDRES_FILE) -o $@
|
else
|
||||||
ifdef COMPSTATIC_CMDS
|
$(LD) $(LDFLAGS) $(LIBRARY_DIRS) @$(LDRES_FILE) $(LCFILE) -o $@
|
||||||
$(COMPSTATIC) $(COMPSTATIC_CMDS) $(COMPSTATIC_FLAGS) -f $(BINDIR)/component.files $(CTR_STDOUT)
|
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
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user