diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-02-07 09:29:02 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-02-07 09:29:02 -0600 |
| commit | 50c464397767530fd6ce39d47d3cbd5a426c5e39 (patch) | |
| tree | 524b97e7ad461ed466bfe16089b2d54f7ce1472a | |
| parent | b5ac4acfe85d174f7e034fc852223c07590f8986 (diff) | |
| download | nuttx-50c464397767530fd6ce39d47d3cbd5a426c5e39.tar.gz nuttx-50c464397767530fd6ce39d47d3cbd5a426c5e39.tar.bz2 nuttx-50c464397767530fd6ce39d47d3cbd5a426c5e39.zip | |
Some Windows native build fixes
| -rw-r--r-- | apps/platform/Makefile | 7 | ||||
| -rw-r--r-- | nuttx/Makefile.win | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/apps/platform/Makefile b/apps/platform/Makefile index 02b055b50..196dfd52d 100644 --- a/apps/platform/Makefile +++ b/apps/platform/Makefile @@ -1,7 +1,7 @@ ############################################################################ # apps/platform/Makefile # -# Copyright (C) 2013 Gregory Nutt. All rights reserved. +# Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -41,9 +41,14 @@ include $(APPDIR)$(DELIM)Make.defs # Tool stuff ifeq ($(DIRLINK),) +ifeq ($(CONFIG_WINDOWS_NATIVE),y) +DIRLINK = $(TOPDIR)/tools/link.bat +DIRUNLINK = $(TOPDIR)/tools/unlink.bat +else DIRLINK = $(TOPDIR)/tools/link.sh DIRUNLINK = $(TOPDIR)/tools/unlink.sh endif +endif ifeq ($(WINTOOL),y) INCDIROPT = -w diff --git a/nuttx/Makefile.win b/nuttx/Makefile.win index 369e1319b..d224ea8b5 100644 --- a/nuttx/Makefile.win +++ b/nuttx/Makefile.win @@ -60,7 +60,7 @@ ARCH_INC = $(ARCH_DIR)\include ifeq ($(CONFIG_ARCH_BOARD_CUSTOM),y) BOARD_DIR = $(CONFIG_ARCH_BOARD_CUSTOM_DIR) else - BOARD_DIR = configs/$(CONFIG_ARCH_BOARD) + BOARD_DIR = configs$(DELIM)$(CONFIG_ARCH_BOARD) endif # Add-on directories. These may or may not be in place in the |