From 58ab7a4dd68b0fcdcf8e0d999627b00c5c9feb50 Mon Sep 17 00:00:00 2001 From: nakasima Date: Wed, 8 Aug 2007 09:49:54 +0000 Subject: [PATCH] support TWL_PRIVATE. git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@226 4ee2a332-4b2b-5046-8439-1ba90f034370 --- build/buildtools/@privatedefs | 21 +++++++++++++++++++++ build/buildtools/_privatedefs | 21 +++++++++++++++++++++ build/buildtools/commondefs | 17 +++++++---------- build/libraries/Makefile | 11 ++++++++--- build/libraries/cs/_ | 0 build/libraries/devices/Makefile | 5 +++++ build/libraries/devices/sdmc/_ | 0 build/libraries/fatfs/_ | 0 8 files changed, 62 insertions(+), 13 deletions(-) create mode 100644 build/buildtools/@privatedefs create mode 100644 build/buildtools/_privatedefs create mode 100644 build/libraries/cs/_ create mode 100644 build/libraries/devices/sdmc/_ create mode 100644 build/libraries/fatfs/_ diff --git a/build/buildtools/@privatedefs b/build/buildtools/@privatedefs new file mode 100644 index 0000000..965cc8f --- /dev/null +++ b/build/buildtools/@privatedefs @@ -0,0 +1,21 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlSDK - @privatedefs +# File: Makefile +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded insructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# 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. +# +# $Date:: 2007-07-31#$ +# $Rev: 387 $ +# $Author: terui $ +#---------------------------------------------------------------------------- + +TWL_WITH_ARM7 := TRUE + +#===== End of @privatedefs ===== diff --git a/build/buildtools/_privatedefs b/build/buildtools/_privatedefs new file mode 100644 index 0000000..9d489d3 --- /dev/null +++ b/build/buildtools/_privatedefs @@ -0,0 +1,21 @@ +#! make -f +#---------------------------------------------------------------------------- +# Project: TwlSDK - _privatedefs +# File: Makefile +# +# Copyright 2007 Nintendo. All rights reserved. +# +# These coded insructions, statements, and computer programs contain +# proprietary information of Nintendo of America Inc. and/or Nintendo +# Company Ltd., and are protected by Federal copyright law. They may +# 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. +# +# $Date:: 2007-07-31#$ +# $Rev: 387 $ +# $Author: terui $ +#---------------------------------------------------------------------------- + +TWL_PRIVATE := TRUE + +#===== End of _privatedefs ===== diff --git a/build/buildtools/commondefs b/build/buildtools/commondefs index 53ff0bb..6eabd23 100644 --- a/build/buildtools/commondefs +++ b/build/buildtools/commondefs @@ -229,16 +229,6 @@ include $(NITROSDK_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- -ifeq ($(NITRO_PRIVATE),TRUE) -TWL_PRIVATE := TRUE -endif - -ifeq ($(NITRO_WITH_ARM7),TRUE) -TWL_WITH_ARM7 := TRUE -endif - -#---------------------------------------------------------------------------- - ### Global Library resettings GINCLUDES := $(TWL_INCDIR) $(GINCLUDES) @@ -265,6 +255,13 @@ TWL_INSTALL_COMPONENTSDIR := $(TWL_INSTALL_ROOT)/components TWL_INSTALL_ADDINS := $(TWL_INSTALL_ROOT)/add-ins +#---------------------------------------------------------------------------- +# PRIVATE FLAGS +# +-include $(TWL_BUILDTOOLSDIR)/_privatedefs +-include $(TWL_BUILDTOOLSDIR)/@privatedefs + + #---------------------------------------------------------------------------- # Compiler flags # diff --git a/build/libraries/Makefile b/build/libraries/Makefile index 956d78d..81f63b3 100644 --- a/build/libraries/Makefile +++ b/build/libraries/Makefile @@ -25,7 +25,6 @@ SUBDIRS = \ os \ pxi \ mi \ - vlink \ spi \ ctrdg \ aes \ @@ -33,13 +32,19 @@ SUBDIRS = \ cdc \ snd \ camera \ - cs \ - fatfs \ devices \ dsp \ el \ sample_dll \ +ifdef TWL_PRIVATE +SUBDIRS += \ + vlink \ + cs \ + fatfs \ + +endif + #---------------------------------------------------------------------------- export NITRO_BLXCHECKED = yes diff --git a/build/libraries/cs/_ b/build/libraries/cs/_ new file mode 100644 index 0000000..e69de29 diff --git a/build/libraries/devices/Makefile b/build/libraries/devices/Makefile index 73a8cd3..65a48c4 100644 --- a/build/libraries/devices/Makefile +++ b/build/libraries/devices/Makefile @@ -21,8 +21,13 @@ include $(TWLSDK_ROOT)/build/buildtools/commondefs #---------------------------------------------------------------------------- SUBDIRS = \ + +ifdef TWL_PRIVATE +SUBDIRS += \ sdmc \ +endif + #---------------------------------------------------------------------------- export NITRO_BLXCHECKED = yes diff --git a/build/libraries/devices/sdmc/_ b/build/libraries/devices/sdmc/_ new file mode 100644 index 0000000..e69de29 diff --git a/build/libraries/fatfs/_ b/build/libraries/fatfs/_ new file mode 100644 index 0000000..e69de29