From 4a56b4a145e2cd923378cc223811e79dd3cccf0d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 28 Mar 2013 13:23:30 +1100 Subject: [PATCH] build: fixed SITL build on windows --- mk/apm.mk | 2 ++ mk/environ.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mk/apm.mk b/mk/apm.mk index 478ea53a2c..cc0760849f 100644 --- a/mk/apm.mk +++ b/mk/apm.mk @@ -20,6 +20,7 @@ else include $(MK_DIR)/targets.mk include $(MK_DIR)/sketch_sources.mk +ifneq ($(MAKECMDGOALS),clean) # board specific includes ifeq ($(HAL_BOARD),HAL_BOARD_APM1) include $(MK_DIR)/board_avr.mk @@ -36,5 +37,6 @@ endif ifeq ($(HAL_BOARD),HAL_BOARD_PX4) include $(MK_DIR)/board_px4.mk endif +endif endif diff --git a/mk/environ.mk b/mk/environ.mk index dccfc50b61..362696c6b2 100644 --- a/mk/environ.mk +++ b/mk/environ.mk @@ -47,7 +47,7 @@ else endif ifneq ($(findstring CYGWIN, $(SYSTYPE)),) # Convert cygwin path into a windows normal path - SKETCHBOOK := $(shell cygpath -m ${SKETCHBOOK}) + SKETCHBOOK := $(shell cygpath ${SKETCHBOOK}) endif #