summaryrefslogtreecommitdiff
path: root/nuttx/arch/x86/src/Makefile
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-05 00:01:21 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2011-03-05 00:01:21 +0000
commitd4d884ccde2057574f9846c8a4aad91c68874f81 (patch)
tree743c714a95e75cabbb64ac865b865627c0d20100 /nuttx/arch/x86/src/Makefile
parent55d4f54ef204271e27703b5e7a89d58c13c2b294 (diff)
downloadpx4-nuttx-d4d884ccde2057574f9846c8a4aad91c68874f81.tar.gz
px4-nuttx-d4d884ccde2057574f9846c8a4aad91c68874f81.tar.bz2
px4-nuttx-d4d884ccde2057574f9846c8a4aad91c68874f81.zip
More QEMU logic
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3337 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/x86/src/Makefile')
-rw-r--r--nuttx/arch/x86/src/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/arch/x86/src/Makefile b/nuttx/arch/x86/src/Makefile
index 9281828bb..e34e85338 100644
--- a/nuttx/arch/x86/src/Makefile
+++ b/nuttx/arch/x86/src/Makefile
@@ -42,13 +42,13 @@ ARCH_SUBDIR = i486
endif
ifeq ($(WINTOOL),y)
- NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx}"
+ NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx$(EXEEXT)}"
CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-I "${shell cygpath -w $(ARCH_SRCDIR)/$(ARCH_SUBDIR)}" \
-I "${shell cygpath -w $(TOPDIR)/sched}"
else
- NUTTX = $(TOPDIR)/nuttx
+ NUTTX = $(TOPDIR)/nuttx$(EXEEXT)
CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common \
-I$(ARCH_SRCDIR)/$(ARCH_SUBDIR) -I$(TOPDIR)/sched
endif
@@ -99,8 +99,8 @@ libarch$(LIBEXT): $(OBJS)
board/libboard$(LIBEXT):
@$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT)
-nuttx: $(HEAD_AOBJ) board/libboard$(LIBEXT)
- @echo "LD: nuttx"
+nuttx$(EXEEXT): $(HEAD_AOBJ) board/libboard$(LIBEXT)
+ @echo "LD: nuttx$(EXEEXT)"
@$(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) -o $(NUTTX)$(EXEEXT) $(HEAD_AOBJ) $(EXTRA_OBJS) \
--start-group $(LDLIBS) -lboard --end-group $(EXTRA_LIBS) $(LIBGCC)
ifeq ($(CONFIG_BOOT_RUNFROMFLASH),y)