Skip to content

Commit

Permalink
Various fixes necessary to build the simulator under MSYS.
Browse files Browse the repository at this point in the history
  • Loading branch information
gregory-nutt committed May 31, 2018
1 parent 634dd77 commit 0509c48
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 19 deletions.
8 changes: 7 additions & 1 deletion Make.defs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -71,6 +76,7 @@ else
DIRLINK = $(TOPDIR)/tools/link.sh
endif
endif
endif

ifeq ($(WINTOOL),y)
INCDIROPT = -w
Expand Down
19 changes: 1 addition & 18 deletions platform/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 0509c48

Please sign in to comment.