diff options
| author | px4dev <px4@purgatory.org> | 2013-01-17 00:07:51 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-17 00:07:51 -0800 |
| commit | 7d7c352fb44b718cb96096a624a19b5225e39f92 (patch) | |
| tree | 3c9d3eed0475eb6d1cbf197efda5ac1c2b0ffc5c | |
| parent | ab0459c1f47689d9b4f2841111bd39f61a1d8f21 (diff) | |
| parent | 07114f0a322613a1c3f2838df54916fdac4d8691 (diff) | |
| download | px4-firmware-7d7c352fb44b718cb96096a624a19b5225e39f92.tar.gz px4-firmware-7d7c352fb44b718cb96096a624a19b5225e39f92.tar.bz2 px4-firmware-7d7c352fb44b718cb96096a624a19b5225e39f92.zip | |
Merge pull request #162 from PX4/windows_build_fix
Windows build fix attempt
| -rw-r--r-- | nuttx/configs/px4fmu/common/Make.defs | 4 | ||||
| -rw-r--r-- | nuttx/configs/px4io/common/Make.defs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/configs/px4fmu/common/Make.defs b/nuttx/configs/px4fmu/common/Make.defs index 52c00cd5a..756286ccb 100644 --- a/nuttx/configs/px4fmu/common/Make.defs +++ b/nuttx/configs/px4fmu/common/Make.defs @@ -79,7 +79,7 @@ LDSCRIPT = ld.script ifeq ($(WINTOOL),y) # Windows-native toolchains - DIRLINK = $(TOPDIR)/tools/winlink.sh + DIRLINK = $(TOPDIR)/tools/copydir.sh DIRUNLINK = $(TOPDIR)/tools/unlink.sh MKDEP = $(TOPDIR)/tools/mknulldeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" @@ -88,7 +88,7 @@ ifeq ($(WINTOOL),y) else ifeq ($(PX4_WINTOOL),y) # Windows-native toolchains (MSYS) - DIRLINK = $(TOPDIR)/tools/winlink.sh + DIRLINK = $(TOPDIR)/tools/copydir.sh DIRUNLINK = $(TOPDIR)/tools/unlink.sh MKDEP = $(TOPDIR)/tools/mknulldeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include diff --git a/nuttx/configs/px4io/common/Make.defs b/nuttx/configs/px4io/common/Make.defs index d6d52e3d2..4958f7092 100644 --- a/nuttx/configs/px4io/common/Make.defs +++ b/nuttx/configs/px4io/common/Make.defs @@ -72,7 +72,7 @@ LDSCRIPT = ld.script ifeq ($(WINTOOL),y) # Windows-native toolchains - DIRLINK = $(TOPDIR)/tools/winlink.sh + DIRLINK = $(TOPDIR)/tools/copydir.sh DIRUNLINK = $(TOPDIR)/tools/unlink.sh MKDEP = $(TOPDIR)/tools/mknulldeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" @@ -81,7 +81,7 @@ ifeq ($(WINTOOL),y) else ifeq ($(PX4_WINTOOL),y) # Windows-native toolchains (MSYS) - DIRLINK = $(TOPDIR)/tools/winlink.sh + DIRLINK = $(TOPDIR)/tools/copydir.sh DIRUNLINK = $(TOPDIR)/tools/unlink.sh MKDEP = $(TOPDIR)/tools/mknulldeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include |