buildtools修正。

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-09-30%20-%20paladin.7z/paladin/ctr_firmware@3 b871894f-2f95-9b40-918c-086798483c85
This commit is contained in:
nakasima 2008-11-07 09:21:34 +00:00
parent 6707109f4b
commit 58d5bae0e3
8 changed files with 23 additions and 24 deletions

View File

@ -129,7 +129,7 @@ SPACE := $(EMPTY) $(EMPTY)
# #
-include $(CTR_BUILDTOOLSDIR)/commondefs.cygpath -include $(CTR_BUILDTOOLSDIR)/commondefs.cygpath
ROOT := $(subst $(SPACE),\ ,$(subst \,/,$(CTRSDK_ROOT))) ROOT := $(call eupath,$(CTRSDK_ROOT))
CTR_BUILDTOOLSDIR := $(ROOT)/build/buildtools CTR_BUILDTOOLSDIR := $(ROOT)/build/buildtools
CTR_BUILDSETUPDIR := $(ROOT)/build/buildsetup CTR_BUILDSETUPDIR := $(ROOT)/build/buildsetup
CTR_INCDIR := $(ROOT)/include CTR_INCDIR := $(ROOT)/include
@ -172,11 +172,11 @@ CTRSYSTEM_INCDIR ?=
# $(ROOT)/lib/CtrWireless # $(ROOT)/lib/CtrWireless
# #
# includes should be in # includes should be in
# $(ROOT)/include/nitro_wl/ARM11/*.h # $(ROOT)/include/ctr_wl/ARM11/*.h
# #
# access by #include <nitro_wl/ARM11/*.h> # access by #include <ctr_wl/ARM11/*.h>
# #
# SDK_VERSION_WL is defined in <nitro_wl/ARM11/version_wl.h> # SDK_VERSION_WL is defined in <ctr_wl/ARM11/version_wl.h>
# #
CTRWIRELESS_VERSION ?= 2.78.00 CTRWIRELESS_VERSION ?= 2.78.00
@ -203,7 +203,7 @@ DEFAULT_INCDIR := ./include
DEFAULT_ETCDIR := ./etc DEFAULT_ETCDIR := ./etc
LCF_SUFFIX_ := $(if $(CTR_DIGEST),-C) 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 := $(CTR_SPECDIR)/$(CTR_LIBARCH).lcf
DEFAULT_LCFILE_TEMPLATE := $(CTR_SPECDIR)/$(CTR_LIBARCH)$(LCF_SUFFIX_).lcf.template DEFAULT_LCFILE_TEMPLATE := $(CTR_SPECDIR)/$(CTR_LIBARCH)$(LCF_SUFFIX_).lcf.template
DEFAULT_LCFILE_SPEC := $(CTR_SPECDIR)/$(CTR_LIBARCH).lsf DEFAULT_LCFILE_SPEC := $(CTR_SPECDIR)/$(CTR_LIBARCH).lsf

View File

@ -437,7 +437,7 @@ endif
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# switch for TS board # switch for TS board
# #
# Default value of CTR_TS_VERSION is defined in <nitro/spec.h> # Default value of CTR_TS_VERSION is defined in <ctr/spec.h>
# #
# CTR_TS_VERSION = [0/100/200] # CTR_TS_VERSION = [0/100/200]
# #

View File

@ -179,7 +179,7 @@ endif
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
# switch for TS board # switch for TS board
# #
# Default value of CTR_TS_VERSION is defined in <nitro/spec.h> # Default value of CTR_TS_VERSION is defined in <ctr/spec.h>
# #
# CTR_TS_VERSION = [0/100/200] # CTR_TS_VERSION = [0/100/200]
# #

View File

@ -61,9 +61,9 @@ CYGPATH_DRIVELIST_ALL = $(shell DRIVES=`$(MOUNT) | $(GREP) 'type user' | $(CUT)
# 最小限で速い # 最小限で速い
CYGPATH_DRIVELIST_FAST = $(shell $(CYGPATH) -aw '$(CTRSDK_ROOT)c' \ CYGPATH_DRIVELIST_FAST = $(shell $(CYGPATH) -aw '$(CTRSDK_ROOT)c' \
'$(CWFOLDER_CTR)c' \ '$(CWFOLDER_CTR)c' '$(CWFOLDER_TWL)c' '$(CWFOLDER_NITRO)c' \
'$(CTRSYSTEM_ROOT)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) | $(CUT) -c1)
CYGPATH_DRIVELIST := $(sort $(CYGPATH_DRIVELIST_FAST)) CYGPATH_DRIVELIST := $(sort $(CYGPATH_DRIVELIST_FAST))

View File

@ -54,7 +54,11 @@ endif
# #
# Generate dependency files # 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) DEPEND_RULE2 = $(QUOTE)s/^[^\\t].*: //;s/^\\t//;s/ \\\\$$//;s/\\([^ ].*\\)/\\1:/;1s/^./\\n&/;$(QUOTE)
define MOVE_SRC_DEPEND define MOVE_SRC_DEPEND
@ -69,7 +73,7 @@ ifdef CTR_STD_PCHDR
ifndef CTR_NO_STD_PCHDR ifndef CTR_NO_STD_PCHDR
# .mch # .mch
PCHDR_SRC = $(ROOT)/include/nitro.h PCHDR_SRC = $(ROOT)/include/ctr.h
PCHDR_CACHE = $(ROOT)/cache/include PCHDR_CACHE = $(ROOT)/cache/include
PCHDR_C_DEFS = $(sort $(filter -DSDK_%,$(CCFLAGS))) 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) MAKELCF_OPTS = $(MAKELCF_FLAGS) $(MAKELCF_DEFS) $(MAKELCF_FORMAT)
$(LCFILE_AUTOGEN): $(LCFILE_SPEC) $(LCFILE_TEMPLATE) $(MAKEFILE) $(CTR_BUILDTOOLSDIR)/commondefs $(LDEPENDS_LCF) $(LCFILE_AUTOGEN): $(LCFILE_SPEC) $(LCFILE_TEMPLATE) $(MAKEFILE) $(CTR_BUILDTOOLSDIR)/commondefs
$(MAKELCF) $(MAKELCF_OPTS) $< $(LCFILE_TEMPLATE) $@ $(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 endif

View File

@ -33,7 +33,7 @@ run:
# @echo ==== $(CURDIR) > $(AUTOTESTLOG).tmp # @echo ==== $(CURDIR) > $(AUTOTESTLOG).tmp
# @echo :TEST-TARGET: [$(BINDIR)/$(firstword $(TARGET_BIN))] >> $(AUTOTESTLOG).tmp # @echo :TEST-TARGET: [$(BINDIR)/$(firstword $(TARGET_BIN))] >> $(AUTOTESTLOG).tmp
# @echo >> $(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 '/<AUTO-TEST> / || NR <= 30' $(AUTOTESTLOG).tmp >> $(AUTOTESTLOG) # @gawk '/<AUTO-TEST> / || NR <= 30' $(AUTOTESTLOG).tmp >> $(AUTOTESTLOG)
# @echo >> $(AUTOTESTLOG) # @echo >> $(AUTOTESTLOG)
endif endif

View File

@ -13,13 +13,7 @@
# not be disclosed to third parties or copied or duplicated in any form, # 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. # in whole or in part, without the prior written consent of Nintendo.
# #
# $Log: sdk_indent.pl,v $ # $Log: $
# 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
# <20>VK
#
# $NoKeywords: $ # $NoKeywords: $
############################################################################## ##############################################################################

View File

@ -15,6 +15,6 @@
# $NoKeywords: $ # $NoKeywords: $
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
-include $(NITROSDK_ROOT)/include/nitro/version.h -include $(CTRSDK_ROOT)/include/ctr/version.h
#===== End of versiondefs ===== #===== End of versiondefs =====