From fc69dd70cf3c669308240bb0a6bb05d6eda51487 Mon Sep 17 00:00:00 2001
From: kkitayam <45088311+kkitayam@users.noreply.github.com>
Date: Tue, 12 Jan 2021 01:02:17 +0900
Subject: [PATCH] Changed some source file paths for SRC_C to relative paths.
 Added statements to validate GCCVERSION on Windows Command Prompt.

---
 hw/bsp/adafruit_clue/board.mk               | 6 ++++++
 hw/bsp/arduino_nano33_ble/board.mk          | 6 ++++++
 hw/bsp/circuitplayground_bluefruit/board.mk | 6 ++++++
 hw/bsp/da14695_dk_usb/board.mk              | 2 +-
 hw/bsp/da1469x_dk_pro/board.mk              | 2 +-
 hw/bsp/double_m33_express/board.mk          | 2 +-
 hw/bsp/feather_nrf52840_express/board.mk    | 6 ++++++
 hw/bsp/feather_nrf52840_sense/board.mk      | 6 ++++++
 hw/bsp/itsybitsy_nrf52840/board.mk          | 6 ++++++
 hw/bsp/nrf52840_mdk_dongle/board.mk         | 6 ++++++
 hw/bsp/pca10056/board.mk                    | 6 ++++++
 hw/bsp/pca10059/board.mk                    | 6 ++++++
 hw/bsp/pca10100/board.mk                    | 6 ++++++
 hw/bsp/raytac_mdbt50q_rx/board.mk           | 6 ++++++
 14 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/hw/bsp/adafruit_clue/board.mk b/hw/bsp/adafruit_clue/board.mk
index d5f7c7cd..ef6e093f 100644
--- a/hw/bsp/adafruit_clue/board.mk
+++ b/hw/bsp/adafruit_clue/board.mk
@@ -14,9 +14,15 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align
 
 # due to tusb_hal_nrf_power_event
 GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion)))
+ifeq ($(UNAME),Windows)
+ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1)
+CFLAGS += -Wno-error=cast-function-type
+endif
+else
 ifeq ($(shell expr $(GCCVERSION) \>= 8), 1)
 CFLAGS += -Wno-error=cast-function-type
 endif
+endif
 
 # All source paths should be relative to the top level.
 LD_FILE = hw/bsp/$(BOARD)/nrf52840_s140_v6.ld
diff --git a/hw/bsp/arduino_nano33_ble/board.mk b/hw/bsp/arduino_nano33_ble/board.mk
index d1d62bdf..63d1550d 100644
--- a/hw/bsp/arduino_nano33_ble/board.mk
+++ b/hw/bsp/arduino_nano33_ble/board.mk
@@ -14,9 +14,15 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align
 
 # due to tusb_hal_nrf_power_event
 GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion)))
+ifeq ($(UNAME),Windows)
+ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1)
+CFLAGS += -Wno-error=cast-function-type
+endif
+else
 ifeq ($(shell expr $(GCCVERSION) \>= 8), 1)
 CFLAGS += -Wno-error=cast-function-type
 endif
+endif
 
 # All source paths should be relative to the top level.
 #LD_FILE = hw/bsp/$(BOARD)/linker_script.ld
diff --git a/hw/bsp/circuitplayground_bluefruit/board.mk b/hw/bsp/circuitplayground_bluefruit/board.mk
index d5f7c7cd..ef6e093f 100644
--- a/hw/bsp/circuitplayground_bluefruit/board.mk
+++ b/hw/bsp/circuitplayground_bluefruit/board.mk
@@ -14,9 +14,15 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align
 
 # due to tusb_hal_nrf_power_event
 GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion)))
+ifeq ($(UNAME),Windows)
+ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1)
+CFLAGS += -Wno-error=cast-function-type
+endif
+else
 ifeq ($(shell expr $(GCCVERSION) \>= 8), 1)
 CFLAGS += -Wno-error=cast-function-type
 endif
+endif
 
 # All source paths should be relative to the top level.
 LD_FILE = hw/bsp/$(BOARD)/nrf52840_s140_v6.ld
diff --git a/hw/bsp/da14695_dk_usb/board.mk b/hw/bsp/da14695_dk_usb/board.mk
index 8fef7d10..b097262d 100644
--- a/hw/bsp/da14695_dk_usb/board.mk
+++ b/hw/bsp/da14695_dk_usb/board.mk
@@ -21,7 +21,7 @@ SRC_C += \
 	$(MCU_FAMILY_DIR)/src/da1469x_clock.c \
 	$(MCU_FAMILY_DIR)/src/hal_gpio.c \
 
-SRC_S += $(TOP)/hw/bsp/$(BOARD)/gcc_startup_da1469x.S
+SRC_S += hw/bsp/$(BOARD)/gcc_startup_da1469x.S
 
 INC += \
 	$(TOP)/hw/bsp/$(BOARD) \
diff --git a/hw/bsp/da1469x_dk_pro/board.mk b/hw/bsp/da1469x_dk_pro/board.mk
index 60a62378..16bd6de6 100644
--- a/hw/bsp/da1469x_dk_pro/board.mk
+++ b/hw/bsp/da1469x_dk_pro/board.mk
@@ -21,7 +21,7 @@ SRC_C += \
 	$(MCU_FAMILY_DIR)/src/da1469x_clock.c \
 	$(MCU_FAMILY_DIR)/src/hal_gpio.c \
 
-SRC_S += $(TOP)/hw/bsp/$(BOARD)/gcc_startup_da1469x.S
+SRC_S += hw/bsp/$(BOARD)/gcc_startup_da1469x.S
 
 INC += \
 	$(TOP)/hw/bsp/$(BOARD) \
diff --git a/hw/bsp/double_m33_express/board.mk b/hw/bsp/double_m33_express/board.mk
index 6cc2495d..c3401e5b 100644
--- a/hw/bsp/double_m33_express/board.mk
+++ b/hw/bsp/double_m33_express/board.mk
@@ -26,7 +26,7 @@ SRC_C += \
 	$(MCU_DIR)/drivers/fsl_reset.c \
 	$(MCU_DIR)/drivers/fsl_usart.c \
 	$(MCU_DIR)/drivers/fsl_flexcomm.c \
-	$(TOP)/lib/sct_neopixel/sct_neopixel.c 
+	lib/sct_neopixel/sct_neopixel.c 
 
 INC += \
     $(TOP)/hw/bsp/ \
diff --git a/hw/bsp/feather_nrf52840_express/board.mk b/hw/bsp/feather_nrf52840_express/board.mk
index 6cc97283..2feb070a 100644
--- a/hw/bsp/feather_nrf52840_express/board.mk
+++ b/hw/bsp/feather_nrf52840_express/board.mk
@@ -14,9 +14,15 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align
 
 # due to tusb_hal_nrf_power_event
 GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion)))
+ifeq ($(UNAME),Windows)
+ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1)
+CFLAGS += -Wno-error=cast-function-type
+endif
+else
 ifeq ($(shell expr $(GCCVERSION) \>= 8), 1)
 CFLAGS += -Wno-error=cast-function-type
 endif
+endif
 
 # All source paths should be relative to the top level.
 LD_FILE = hw/bsp/$(BOARD)/nrf52840_s140_v6.ld
diff --git a/hw/bsp/feather_nrf52840_sense/board.mk b/hw/bsp/feather_nrf52840_sense/board.mk
index d5f7c7cd..ef6e093f 100644
--- a/hw/bsp/feather_nrf52840_sense/board.mk
+++ b/hw/bsp/feather_nrf52840_sense/board.mk
@@ -14,9 +14,15 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align
 
 # due to tusb_hal_nrf_power_event
 GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion)))
+ifeq ($(UNAME),Windows)
+ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1)
+CFLAGS += -Wno-error=cast-function-type
+endif
+else
 ifeq ($(shell expr $(GCCVERSION) \>= 8), 1)
 CFLAGS += -Wno-error=cast-function-type
 endif
+endif
 
 # All source paths should be relative to the top level.
 LD_FILE = hw/bsp/$(BOARD)/nrf52840_s140_v6.ld
diff --git a/hw/bsp/itsybitsy_nrf52840/board.mk b/hw/bsp/itsybitsy_nrf52840/board.mk
index 6cc97283..2feb070a 100644
--- a/hw/bsp/itsybitsy_nrf52840/board.mk
+++ b/hw/bsp/itsybitsy_nrf52840/board.mk
@@ -14,9 +14,15 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align
 
 # due to tusb_hal_nrf_power_event
 GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion)))
+ifeq ($(UNAME),Windows)
+ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1)
+CFLAGS += -Wno-error=cast-function-type
+endif
+else
 ifeq ($(shell expr $(GCCVERSION) \>= 8), 1)
 CFLAGS += -Wno-error=cast-function-type
 endif
+endif
 
 # All source paths should be relative to the top level.
 LD_FILE = hw/bsp/$(BOARD)/nrf52840_s140_v6.ld
diff --git a/hw/bsp/nrf52840_mdk_dongle/board.mk b/hw/bsp/nrf52840_mdk_dongle/board.mk
index 8ce8929b..baa4cc22 100644
--- a/hw/bsp/nrf52840_mdk_dongle/board.mk
+++ b/hw/bsp/nrf52840_mdk_dongle/board.mk
@@ -13,9 +13,15 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align
 
 # due to tusb_hal_nrf_power_event
 GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion)))
+ifeq ($(UNAME),Windows)
+ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1)
+CFLAGS += -Wno-error=cast-function-type
+endif
+else
 ifeq ($(shell expr $(GCCVERSION) \>= 8), 1)
 CFLAGS += -Wno-error=cast-function-type
 endif
+endif
 
 # All source paths should be relative to the top level.
 LD_FILE = hw/bsp/$(BOARD)/$(BOARD).ld
diff --git a/hw/bsp/pca10056/board.mk b/hw/bsp/pca10056/board.mk
index 8f4887dc..3ea85983 100644
--- a/hw/bsp/pca10056/board.mk
+++ b/hw/bsp/pca10056/board.mk
@@ -14,9 +14,15 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align
 
 # due to tusb_hal_nrf_power_event
 GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion)))
+ifeq ($(UNAME),Windows)
+ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1)
+CFLAGS += -Wno-error=cast-function-type
+endif
+else
 ifeq ($(shell expr $(GCCVERSION) \>= 8), 1)
 CFLAGS += -Wno-error=cast-function-type
 endif
+endif
 
 # All source paths should be relative to the top level.
 LD_FILE = hw/mcu/nordic/nrfx/mdk/nrf52840_xxaa.ld
diff --git a/hw/bsp/pca10059/board.mk b/hw/bsp/pca10059/board.mk
index bd7a80c0..e9bc890c 100644
--- a/hw/bsp/pca10059/board.mk
+++ b/hw/bsp/pca10059/board.mk
@@ -14,9 +14,15 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align
 
 # due to tusb_hal_nrf_power_event
 GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion)))
+ifeq ($(UNAME),Windows)
+ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1)
+CFLAGS += -Wno-error=cast-function-type
+endif
+else
 ifeq ($(shell expr $(GCCVERSION) \>= 8), 1)
 CFLAGS += -Wno-error=cast-function-type
 endif
+endif
 
 # All source paths should be relative to the top level.
 LD_FILE = hw/bsp/$(BOARD)/$(BOARD).ld
diff --git a/hw/bsp/pca10100/board.mk b/hw/bsp/pca10100/board.mk
index 4b5be082..0b4d42f2 100644
--- a/hw/bsp/pca10100/board.mk
+++ b/hw/bsp/pca10100/board.mk
@@ -14,9 +14,15 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align
 
 # due to tusb_hal_nrf_power_event
 GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion)))
+ifeq ($(UNAME),Windows)
+ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1)
+CFLAGS += -Wno-error=cast-function-type
+endif
+else
 ifeq ($(shell expr $(GCCVERSION) \>= 8), 1)
 CFLAGS += -Wno-error=cast-function-type
 endif
+endif
 
 # All source paths should be relative to the top level.
 LD_FILE = hw/mcu/nordic/nrfx/mdk/nrf52833_xxaa.ld
diff --git a/hw/bsp/raytac_mdbt50q_rx/board.mk b/hw/bsp/raytac_mdbt50q_rx/board.mk
index e153aab0..6ff079dd 100644
--- a/hw/bsp/raytac_mdbt50q_rx/board.mk
+++ b/hw/bsp/raytac_mdbt50q_rx/board.mk
@@ -13,9 +13,15 @@ CFLAGS += -Wno-error=undef -Wno-error=unused-parameter -Wno-error=cast-align
 
 # due to tusb_hal_nrf_power_event
 GCCVERSION = $(firstword $(subst ., ,$(shell arm-none-eabi-gcc -dumpversion)))
+ifeq ($(UNAME),Windows)
+ifeq ($(shell if $(GCCVERSION) geq 8 echo 1), 1)
+CFLAGS += -Wno-error=cast-function-type
+endif
+else
 ifeq ($(shell expr $(GCCVERSION) \>= 8), 1)
 CFLAGS += -Wno-error=cast-function-type
 endif
+endif
 
 # All source paths should be relative to the top level.
 LD_FILE = hw/mcu/nordic/nrfx/mdk/nrf52840_xxaa.ld