From 58d5bae0e32a29691d01cacba6aafd8562a47ff6 Mon Sep 17 00:00:00 2001 From: nakasima Date: Fri, 7 Nov 2008 09:21:34 +0000 Subject: [PATCH] =?UTF-8?q?buildtools=E4=BF=AE=E6=AD=A3=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@3 b871894f-2f95-9b40-918c-086798483c85 --- trunk/build/buildtools/commondefs | 10 +++++----- trunk/build/buildtools/commondefs.cctype.CW | 2 +- trunk/build/buildtools/commondefs.cctype.RVCT | 2 +- trunk/build/buildtools/commondefs.cygpath | 4 ++-- trunk/build/buildtools/modulerules.cctype.CW | 17 +++++++++++------ trunk/build/buildtools/modulerules.emtype.ISD | 2 +- trunk/build/buildtools/sdk_indent.pl | 8 +------- trunk/build/buildtools/versiondefs | 2 +- 8 files changed, 23 insertions(+), 24 deletions(-) diff --git a/trunk/build/buildtools/commondefs b/trunk/build/buildtools/commondefs index c5d94a7..2717efd 100644 --- a/trunk/build/buildtools/commondefs +++ b/trunk/build/buildtools/commondefs @@ -129,7 +129,7 @@ SPACE := $(EMPTY) $(EMPTY) # -include $(CTR_BUILDTOOLSDIR)/commondefs.cygpath -ROOT := $(subst $(SPACE),\ ,$(subst \,/,$(CTRSDK_ROOT))) +ROOT := $(call eupath,$(CTRSDK_ROOT)) CTR_BUILDTOOLSDIR := $(ROOT)/build/buildtools CTR_BUILDSETUPDIR := $(ROOT)/build/buildsetup CTR_INCDIR := $(ROOT)/include @@ -172,11 +172,11 @@ CTRSYSTEM_INCDIR ?= # $(ROOT)/lib/CtrWireless # # includes should be in -# $(ROOT)/include/nitro_wl/ARM11/*.h +# $(ROOT)/include/ctr_wl/ARM11/*.h # -# access by #include +# access by #include # -# SDK_VERSION_WL is defined in +# SDK_VERSION_WL is defined in # CTRWIRELESS_VERSION ?= 2.78.00 @@ -203,7 +203,7 @@ DEFAULT_INCDIR := ./include DEFAULT_ETCDIR := ./etc LCF_SUFFIX_ := $(if $(CTR_DIGEST),-C) -CTR_SPECDIR := $(CTR_INCDIR)/nitro/specfiles +CTR_SPECDIR := $(CTR_INCDIR)/ctr/specfiles DEFAULT_LCFILE := $(CTR_SPECDIR)/$(CTR_LIBARCH).lcf DEFAULT_LCFILE_TEMPLATE := $(CTR_SPECDIR)/$(CTR_LIBARCH)$(LCF_SUFFIX_).lcf.template DEFAULT_LCFILE_SPEC := $(CTR_SPECDIR)/$(CTR_LIBARCH).lsf diff --git a/trunk/build/buildtools/commondefs.cctype.CW b/trunk/build/buildtools/commondefs.cctype.CW index 9911550..c7fca8e 100644 --- a/trunk/build/buildtools/commondefs.cctype.CW +++ b/trunk/build/buildtools/commondefs.cctype.CW @@ -437,7 +437,7 @@ endif #---------------------------------------------------------------------------- # switch for TS board # -# Default value of CTR_TS_VERSION is defined in +# Default value of CTR_TS_VERSION is defined in # # CTR_TS_VERSION = [0/100/200] # diff --git a/trunk/build/buildtools/commondefs.cctype.RVCT b/trunk/build/buildtools/commondefs.cctype.RVCT index 985bf39..f7102c7 100644 --- a/trunk/build/buildtools/commondefs.cctype.RVCT +++ b/trunk/build/buildtools/commondefs.cctype.RVCT @@ -179,7 +179,7 @@ endif #---------------------------------------------------------------------------- # switch for TS board # -# Default value of CTR_TS_VERSION is defined in +# Default value of CTR_TS_VERSION is defined in # # CTR_TS_VERSION = [0/100/200] # diff --git a/trunk/build/buildtools/commondefs.cygpath b/trunk/build/buildtools/commondefs.cygpath index f4f33ae..6d9c87e 100644 --- a/trunk/build/buildtools/commondefs.cygpath +++ b/trunk/build/buildtools/commondefs.cygpath @@ -61,9 +61,9 @@ CYGPATH_DRIVELIST_ALL = $(shell DRIVES=`$(MOUNT) | $(GREP) 'type user' | $(CUT) # 最小限で速い CYGPATH_DRIVELIST_FAST = $(shell $(CYGPATH) -aw '$(CTRSDK_ROOT)c' \ - '$(CWFOLDER_CTR)c' \ + '$(CWFOLDER_CTR)c' '$(CWFOLDER_TWL)c' '$(CWFOLDER_NITRO)c' \ '$(CTRSYSTEM_ROOT)c' \ - '$(IS_CTR_DIR)c' '$(IS_TWL_DIR)c' \ + '$(IS_CTR_DIR)c' '$(IS_TWL_DIR)c' '$(IS_NITRO_DIR)c' \ | $(CUT) -c1) CYGPATH_DRIVELIST := $(sort $(CYGPATH_DRIVELIST_FAST)) diff --git a/trunk/build/buildtools/modulerules.cctype.CW b/trunk/build/buildtools/modulerules.cctype.CW index 820fb40..a86cec3 100644 --- a/trunk/build/buildtools/modulerules.cctype.CW +++ b/trunk/build/buildtools/modulerules.cctype.CW @@ -54,7 +54,11 @@ endif # # Generate dependency files # -DEPEND_RULE = $(QUOTE)/ARM_EABI_Support/d;s/\\x0D//g;s/\\\\\\([^ ]\\)/\\/\\1/g;$(QUOTE) +ifdef MSYSTEM +DEPEND_RULE = $(QUOTE)/ARM_EABI_Support/d;s/\\x0D//g;s/\\([^ ]\\)\\\\\([^ ]\\)/\\1\\/\\2/g;$(QUOTE) +else +DEPEND_RULE = $(QUOTE)/ARM_EABI_Support/d;s/\\x0D//g;s!\\([A-Za-z]\\):[\\\\\/]!$(CYGPATH_MOUNTPOINT)\\/\\l\\1\\/!g;s/\\([^ ]\\)\\\\\([^ ]\\)/\\1\\/\\2/g;$(QUOTE) +endif DEPEND_RULE2 = $(QUOTE)s/^[^\\t].*: //;s/^\\t//;s/ \\\\$$//;s/\\([^ ].*\\)/\\1:/;1s/^./\\n&/;$(QUOTE) define MOVE_SRC_DEPEND @@ -69,7 +73,7 @@ ifdef CTR_STD_PCHDR ifndef CTR_NO_STD_PCHDR # .mch -PCHDR_SRC = $(ROOT)/include/nitro.h +PCHDR_SRC = $(ROOT)/include/ctr.h PCHDR_CACHE = $(ROOT)/cache/include PCHDR_C_DEFS = $(sort $(filter -DSDK_%,$(CCFLAGS))) @@ -172,11 +176,12 @@ MAKELCF_FORMAT = -V$(CW_MAJOR_VER) MAKELCF_OPTS = $(MAKELCF_FLAGS) $(MAKELCF_DEFS) $(MAKELCF_FORMAT) -$(LCFILE_AUTOGEN): $(LCFILE_SPEC) $(LCFILE_TEMPLATE) $(MAKEFILE) $(CTR_BUILDTOOLSDIR)/commondefs $(LDEPENDS_LCF) - $(MAKELCF) $(MAKELCF_OPTS) $< $(LCFILE_TEMPLATE) $@ +$(LCFILE_AUTOGEN): $(LCFILE_SPEC) $(LCFILE_TEMPLATE) $(MAKEFILE) $(CTR_BUILDTOOLSDIR)/commondefs + $(MAKELCF) $(MAKELCF_OPTS) $(call empath,$<) $(call empath,$(LCFILE_TEMPLATE)) $(call empath,$@) + +$(LDRES_AUTOGEN): $(LCFILE_SPEC) $(LDRES_TEMPLATE) $(MAKEFILE) $(CTR_BUILDTOOLSDIR)/commondefs + @$(MAKELCF) $(MAKELCF_OPTS) $(call empath,$<) $(call empath,$(LDRES_TEMPLATE)) $(call empath,$@) -$(LDRES_AUTOGEN): $(LCFILE_SPEC) $(LDRES_TEMPLATE) $(MAKEFILE) $(CTR_BUILDTOOLSDIR)/commondefs $(LDEPENDS_RES) - @$(MAKELCF) $(MAKELCF_OPTS) $< $(LDRES_TEMPLATE) $@ endif diff --git a/trunk/build/buildtools/modulerules.emtype.ISD b/trunk/build/buildtools/modulerules.emtype.ISD index df253cc..e540b25 100644 --- a/trunk/build/buildtools/modulerules.emtype.ISD +++ b/trunk/build/buildtools/modulerules.emtype.ISD @@ -33,7 +33,7 @@ run: # @echo ==== $(CURDIR) > $(AUTOTESTLOG).tmp # @echo :TEST-TARGET: [$(BINDIR)/$(firstword $(TARGET_BIN))] >> $(AUTOTESTLOG).tmp # @echo >> $(AUTOTESTLOG).tmp -# cscript $(NITRO_TOOLSDIR)/bin/runEmu.js //Nologo //T:60 $(BINDIR)/$(firstword $(TARGET_BIN)) $(AUTOTESTLOG).tmp +# cscript $(CTR_TOOLSDIR)/bin/runEmu.js //Nologo //T:60 $(BINDIR)/$(firstword $(TARGET_BIN)) $(AUTOTESTLOG).tmp # @gawk '/ / || NR <= 30' $(AUTOTESTLOG).tmp >> $(AUTOTESTLOG) # @echo >> $(AUTOTESTLOG) endif diff --git a/trunk/build/buildtools/sdk_indent.pl b/trunk/build/buildtools/sdk_indent.pl index 1e9148d..3a49385 100644 --- a/trunk/build/buildtools/sdk_indent.pl +++ b/trunk/build/buildtools/sdk_indent.pl @@ -13,13 +13,7 @@ # not be disclosed to third parties or copied or duplicated in any form, # in whole or in part, without the prior written consent of Nintendo. # -# $Log: sdk_indent.pl,v $ -# Revision 1.2 2004/02/05 07:09:01 yasu -# change SDK prefix iris -> nitro -# -# Revision 1.1 2003/12/01 11:17:08 nishida_kenji -# 新規 -# +# $Log: $ # $NoKeywords: $ ############################################################################## diff --git a/trunk/build/buildtools/versiondefs b/trunk/build/buildtools/versiondefs index 2100cdb..12761a8 100644 --- a/trunk/build/buildtools/versiondefs +++ b/trunk/build/buildtools/versiondefs @@ -15,6 +15,6 @@ # $NoKeywords: $ #---------------------------------------------------------------------------- --include $(NITROSDK_ROOT)/include/nitro/version.h +-include $(CTRSDK_ROOT)/include/ctr/version.h #===== End of versiondefs =====