mirror of
https://github.com/apache/nuttx.git
synced 2025-01-13 10:58:49 +08:00
ZNEO now (almost) builds in Windows native environment
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5402 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
parent
d5a83f6c48
commit
f7bc20f341
20 changed files with 55 additions and 21 deletions
|
|
@ -3712,7 +3712,10 @@
|
|||
From Freddie Chopin.
|
||||
* z8encore000zco/ostest and z8f64200100kit/ostest: Can now be modified to
|
||||
support the Windows native builds (see corresponding README.txt files).
|
||||
* configures/z16f2800100zcog - All configurations updated to use the ZDS-II
|
||||
* configs/z16f2800100zcog - All configurations updated to use the ZDS-II
|
||||
5.0.1 toolchain.
|
||||
* configures/z16f2800100zcog - All configurations updated to use Kconfig/mconf
|
||||
* configs/z16f2800100zcog - All configurations updated to use Kconfig/mconf
|
||||
configuration tools.
|
||||
* configs/z16f2800100zcog/ostest - Now supports a native Windows build
|
||||
(other ZNEO configs may also support the native build, but this has not
|
||||
been verfiied).
|
||||
|
|
|
|||
|
|
@ -56,10 +56,10 @@ CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHD
|
|||
CPPFLAGS += -I$(ARCHSRCDIR)
|
||||
|
||||
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
LDFLAGS += @"$(ARCHSRCDIR)/nuttx.linkcmd"
|
||||
LDFLAGS += @"$(ARCHSRCDIR)/nuttx.linkcmd"
|
||||
else
|
||||
ifeq ($(COMPILER),zneocc.exe)
|
||||
LDFLAGS += @"${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}"
|
||||
LDFLAGS += @"${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}"
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
@ -108,7 +108,7 @@ ifeq ($(COMPILER),zneocc.exe)
|
|||
nuttx.linkcmd: $(LINKCMDTEMPLATE)
|
||||
$(Q) cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd
|
||||
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
@echo "$(TOPDIR)\nuttx}"= \>>nuttx.linkcmd
|
||||
@echo "$(TOPDIR)\nuttx"= \>>nuttx.linkcmd
|
||||
@echo "$(ARCHSRCDIR)\$(HEAD_OBJ)", \>>nuttx.linkcmd
|
||||
$(Q) for %%G in ($(LINKLIBS)) do ( echo "$(TOPDIR)\lib\%%G", \>>nuttx.linkcmd )
|
||||
@echo "$(ARCHSRCDIR)\board\libboard$(LIBEXT)", \>>nuttx.linkcmd
|
||||
|
|
@ -133,30 +133,42 @@ nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT) nuttx.linkcmd
|
|||
$(Q) $(LD) $(LDFLAGS)
|
||||
|
||||
.depend: Makefile chip/Make.defs $(DEPSRCS)
|
||||
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
$(Q) if exist board$(DELIM)Makefile ( $(MAKE) -C board TOPDIR="$(TOPDIR)" depend )
|
||||
else
|
||||
$(Q) if [ -e board/Makefile ]; then \
|
||||
$(MAKE) -C board TOPDIR="$(TOPDIR)" depend ; \
|
||||
fi
|
||||
endif
|
||||
$(Q) $(MKDEP) --dep-path chip --dep-path common "$(CC)" -- $(CFLAGS) -- $(DEPSRCS) >Make.dep
|
||||
$(Q) touch $@
|
||||
|
||||
# This is part of the top-level export target
|
||||
|
||||
export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
|
||||
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
$(Q) if exist "$(EXPORT_DIR)$(DELIM)startup" ( copy $(HEAD_OBJ) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)." /b /y)
|
||||
else
|
||||
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
|
||||
cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
|
||||
else \
|
||||
echo "$(EXPORT_DIR)/startup does not exist"; \
|
||||
exit 1; \
|
||||
fi
|
||||
endif
|
||||
|
||||
# Dependencies
|
||||
|
||||
depend: .depend
|
||||
|
||||
clean:
|
||||
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
$(Q) if exist board$(DELIM)Makefile ( $(MAKE) -C board TOPDIR="$(TOPDIR)" clean )
|
||||
else
|
||||
$(Q) if [ -e board/Makefile ]; then \
|
||||
$(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \
|
||||
fi
|
||||
endif
|
||||
ifeq ($(COMPILER),zneocc.exe)
|
||||
$(call DELFILE, nuttx.linkcmd)
|
||||
$(call DELFILE, *.asm)
|
||||
|
|
@ -167,9 +179,13 @@ endif
|
|||
$(call CLEAN)
|
||||
|
||||
distclean: clean
|
||||
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
$(Q) if exist board$(DELIM)Makefile ( $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean )
|
||||
else
|
||||
$(Q) if [ -e board/Makefile ]; then \
|
||||
$(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \
|
||||
fi
|
||||
endif
|
||||
$(call DELFILE, Make.dep)
|
||||
$(call DELFILE, .depend)
|
||||
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@
|
|||
############################################################################
|
||||
|
||||
-include $(TOPDIR)/Make.defs
|
||||
DELIM ?= $(strip /)
|
||||
|
||||
ifeq ($(WINTOOL),y)
|
||||
INCDIROPT = -w
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ define ASSEMBLE
|
|||
endef
|
||||
|
||||
define ARCHIVE
|
||||
echo AR: $2
|
||||
@echo AR: $2
|
||||
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
|
||||
endef
|
||||
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ define ASSEMBLE
|
|||
endef
|
||||
|
||||
define ARCHIVE
|
||||
echo AR: $2
|
||||
@echo AR: $2
|
||||
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
|
||||
endef
|
||||
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ define ASSEMBLE
|
|||
endef
|
||||
|
||||
define ARCHIVE
|
||||
echo AR: $2
|
||||
@echo AR: $2
|
||||
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
|
||||
endef
|
||||
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ define ASSEMBLE
|
|||
endef
|
||||
|
||||
define ARCHIVE
|
||||
echo AR: $2
|
||||
@echo AR: $2
|
||||
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
|
||||
endef
|
||||
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ define ASSEMBLE
|
|||
endef
|
||||
|
||||
define ARCHIVE
|
||||
echo AR: $2
|
||||
@echo AR: $2
|
||||
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
|
||||
endef
|
||||
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ define ASSEMBLE
|
|||
endef
|
||||
|
||||
define ARCHIVE
|
||||
echo AR: $2
|
||||
@echo AR: $2
|
||||
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
|
||||
endef
|
||||
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ define ASSEMBLE
|
|||
endef
|
||||
|
||||
define ARCHIVE
|
||||
echo AR: $2
|
||||
@echo AR: $2
|
||||
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
|
||||
endef
|
||||
|
||||
|
|
|
|||
|
|
@ -139,6 +139,9 @@ ostest
|
|||
the end of the lines after a line continuation (\ ^M). If these
|
||||
trailing bad characters are manually eliminated, then the build
|
||||
will succeed on the next try.
|
||||
d. Hmmm... when last tested, there some missing .obj files in arch/z16/src.
|
||||
A little additional TLC might be needed to get a reliable Windows
|
||||
native build.
|
||||
|
||||
pashello
|
||||
--------
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ define ASSEMBLE
|
|||
endef
|
||||
|
||||
define ARCHIVE
|
||||
echo AR: $2
|
||||
@echo AR: $2
|
||||
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
|
||||
endef
|
||||
|
||||
|
|
|
|||
|
|
@ -8,10 +8,14 @@ CONFIG_NUTTX_NEWCONFIG=y
|
|||
# Build Setup
|
||||
#
|
||||
# CONFIG_EXPERIMENTAL is not set
|
||||
CONFIG_HOST_LINUX=y
|
||||
# CONFIG_HOST_LINUX is not set
|
||||
# CONFIG_HOST_OSX is not set
|
||||
# CONFIG_HOST_WINDOWS is not set
|
||||
CONFIG_HOST_WINDOWS=y
|
||||
# CONFIG_HOST_OTHER is not set
|
||||
# CONFIG_WINDOWS_NATIVE is not set
|
||||
CONFIG_WINDOWS_CYGWIN=y
|
||||
# CONFIG_WINDOWS_MSYS is not set
|
||||
# CONFIG_WINDOWS_OTHER is not set
|
||||
|
||||
#
|
||||
# Build Configuration
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ define ASSEMBLE
|
|||
endef
|
||||
|
||||
define ARCHIVE
|
||||
echo AR: $2
|
||||
@echo AR: $2
|
||||
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
|
||||
endef
|
||||
|
||||
|
|
|
|||
|
|
@ -8,10 +8,14 @@ CONFIG_NUTTX_NEWCONFIG=y
|
|||
# Build Setup
|
||||
#
|
||||
# CONFIG_EXPERIMENTAL is not set
|
||||
CONFIG_HOST_LINUX=y
|
||||
# CONFIG_HOST_LINUX is not set
|
||||
# CONFIG_HOST_OSX is not set
|
||||
# CONFIG_HOST_WINDOWS is not set
|
||||
CONFIG_HOST_WINDOWS=y
|
||||
# CONFIG_HOST_OTHER is not set
|
||||
# CONFIG_WINDOWS_NATIVE is not set
|
||||
CONFIG_WINDOWS_CYGWIN=y
|
||||
# CONFIG_WINDOWS_MSYS is not set
|
||||
# CONFIG_WINDOWS_OTHER is not set
|
||||
|
||||
#
|
||||
# Build Configuration
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ SCHEDSRCDIR = $(TOPDIR)$(DELIM)sched
|
|||
ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
|
||||
|
||||
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
|
||||
USRINCLUDES = -usrinc:'.;$(SCHEDSRCDIR);$(ARCHSRCDIR);$(ARCHSRCDIR)\common'
|
||||
USRINCLUDES = -usrinc:".;$(SCHEDSRCDIR);$(ARCHSRCDIR);$(ARCHSRCDIR)\common"
|
||||
else
|
||||
WSCHEDSRCDIR = ${shell cygpath -w $(SCHEDSRCDIR)}
|
||||
WARCHSRCDIR = ${shell cygpath -w $(ARCHSRCDIR)}
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ define ASSEMBLE
|
|||
endef
|
||||
|
||||
define ARCHIVE
|
||||
echo AR: $2
|
||||
@echo AR: $2
|
||||
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
|
||||
endef
|
||||
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ define ASSEMBLE
|
|||
endef
|
||||
|
||||
define ARCHIVE
|
||||
echo AR: $2
|
||||
@echo AR: $2
|
||||
$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
|
||||
endef
|
||||
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@
|
|||
############################################################################
|
||||
|
||||
-include $(TOPDIR)/Make.defs
|
||||
DELIM ?= $(strip /)
|
||||
|
||||
ifeq ($(WINTOOL),y)
|
||||
INCDIROPT = -w
|
||||
|
|
|
|||
|
|
@ -34,6 +34,8 @@
|
|||
###########################################################################
|
||||
|
||||
-include $(TOPDIR)/Make.defs
|
||||
DELIM ?= $(strip /)
|
||||
|
||||
include proxies$(DELIM)Make.defs
|
||||
include stubs$(DELIM)Make.defs
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue