build: fixed SITL build on windows

12 years ago · 4a56b4a145
2 changed files with 3 additions and 1 deletions
--- a/mk/apm.mk
+++ b/mk/apm.mk
@ -20,6 +20,7 @@ else
				@@ -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
				@@ -36,5 +37,6 @@ endif
 ifeq ($(HAL_BOARD),HAL_BOARD_PX4)
 include $(MK_DIR)/board_px4.mk
 endif
+endif

 endif
--- a/mk/environ.mk
+++ b/mk/environ.mk
@ -47,7 +47,7 @@ else
				@@ -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

 #