diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-04-19 15:59:07 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-04-19 15:59:07 +0000 |
| commit | 7a409acaf666a60ba90af6bf3cfad6f2c9a6e6a9 (patch) | |
| tree | 045128f12769ea3e6ac710ce1c1f13fc68f9fcd4 | |
| parent | ab55f9f8722399fc9247c4cda2a1e4ab5b3716c7 (diff) | |
| download | nuttx-7a409acaf666a60ba90af6bf3cfad6f2c9a6e6a9.tar.gz nuttx-7a409acaf666a60ba90af6bf3cfad6f2c9a6e6a9.tar.bz2 nuttx-7a409acaf666a60ba90af6bf3cfad6f2c9a6e6a9.zip | |
Add libxx
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1713 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/Makefile | 20 | ||||
| -rw-r--r-- | nuttx/configs/mx1ads/ostest/Make.defs | 3 |
2 files changed, 22 insertions, 1 deletions
diff --git a/nuttx/Makefile b/nuttx/Makefile index 934a78100..0c4f292cc 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -98,10 +98,21 @@ endif LINKLIBS = sched/libsched$(LIBEXT) $(ARCH_SRC)/libarch$(LIBEXT) mm/libmm$(LIBEXT) \ lib/liblib$(LIBEXT) examples/$(CONFIG_EXAMPLE)/lib$(CONFIG_EXAMPLE)$(LIBEXT) +# Add libraries for network support. CXX, CXXFLAGS, and COMPILEXX must +# be defined in Make.defs for this to work! + +ifneq ($(CXX),) +LINKLIBS += libxx/liblibxx$(LIBEXT) +endif + +# Add libraries for network support + ifeq ($(CONFIG_NET),y) LINKLIBS += net/libnet$(LIBEXT) netutils/libnetutils$(LIBEXT) endif +# Add libraries for file system support + ifeq ($(CONFIG_NFILE_DESCRIPTORS),0) ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0) LINKLIBS += fs/libfs$(LIBEXT) @@ -113,10 +124,14 @@ else LINKLIBS += fs/libfs$(LIBEXT) drivers/libdrivers$(LIBEXT) endif +# Add libraries for Pascall P-Code + ifneq ($(PCODE_DIR),) LINKLIBS += $(PCODE_DIR)/libpcode$(LIBEXT) endif +# Add libraries for the NX graphics sub-system + ifneq ($(NX_DIR),) LINKLIBS += $(NX_DIR)/libnx$(LIBEXT) endif @@ -188,6 +203,11 @@ sched/libsched$(LIBEXT): context lib/liblib$(LIBEXT): context @$(MAKE) -C lib TOPDIR="$(TOPDIR)" liblib$(LIBEXT) +ifneq ($(CXX),) +libxx/liblibxx$(LIBEXT): context + @$(MAKE) -C libxx TOPDIR="$(TOPDIR)" liblibxx$(LIBEXT) +endif + $(ARCH_SRC)/libarch$(LIBEXT): context @$(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" libarch$(LIBEXT) diff --git a/nuttx/configs/mx1ads/ostest/Make.defs b/nuttx/configs/mx1ads/ostest/Make.defs index f0fa33366..055e4c89f 100644 --- a/nuttx/configs/mx1ads/ostest/Make.defs +++ b/nuttx/configs/mx1ads/ostest/Make.defs @@ -67,6 +67,7 @@ else endif ARCHDEFINES = ARCHINCLUDES = -I. -isystem $(TOPDIR)/include +ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx ARCHPICFLAGS = -fpic ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/ld.script @@ -74,7 +75,7 @@ ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/ld.script CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \ $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) -pipe CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \ - $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) -pipe + $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) -pipe CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) AFLAGS = $(CFLAGS) -D__ASSEMBLY__ |