Aksal/nuttx-apps
1
0
Fork 1
mirror of https://github.com/apache/nuttx-apps.git synced 2026-08-01 20:29:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Various fixes necessary to build the simulator under MSYS.

Browse source
This commit is contained in:
Gregory Nutt 2018-05-31 13:26:18 -06:00
parent 634dd7709b
commit 0509c48ca3
2 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Make.defs
View file

@ -2,7 +2,7 @@
# apps/Make.defs
# Common make definitions provided to all applications
#
# Copyright (C) 2011, 2014, 2016 Gregory Nutt. All rights reserved.
# Copyright (C) 2011, 2014, 2016, 2018 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -58,10 +58,15 @@ endif
# Tools
ifeq ($(DIRLINK),)
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
MKKCONFIG = $(APPDIR)\tools\mkkconfig.bat
DIRLINK = $(TOPDIR)\tools\link.bat
DIRUNLINK = $(TOPDIR)\tools\unlink.bat
else ifeq ($(CONFIG_WINDOWS_MSYS),y)
MKKCONFIG = $(APPDIR)/tools/mkkconfig.sh
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
else
MKKCONFIG = $(APPDIR)/tools/mkkconfig.sh
DIRUNLINK = $(TOPDIR)/tools/unlink.sh
@ -71,6 +76,7 @@ else
DIRLINK = $(TOPDIR)/tools/link.sh
endif
endif
endif
ifeq ($(WINTOOL),y)
INCDIROPT = -w

19
platform/Makefile
View file

@ -1,7 +1,7 @@
############################################################################
# apps/platform/Makefile
#
# Copyright (C) 2013-2014, 2016-2017 Gregory Nutt. All rights reserved.
# Copyright (C) 2013-2014, 2016-2018 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -41,23 +41,6 @@ DELIM ?= $(strip /)
include $(APPDIR)$(DELIM)Make.defs
# Platform-specific Appliction Support
# Tool stuff
ifeq ($(DIRLINK),)
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)link.bat
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.bat
else
DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)link.sh
DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
endif
endif
ifeq ($(WINTOOL),y)
INCDIROPT = -w
endif
# Directories
GNUDIR = gnu