Windows Build Fixes GNU make 4.2.1 (#502)

After update of GNU make the tests for Windows OS are no longer needed. Note that GNU make 4.2.1 is used to build BMP under Windows OS.
Make native working

Again, the newer version of GCC make does not need the OS tests.
This commit is contained in:
Sid Price 2019-08-28 02:45:41 -06:00 committed by UweBonnes
parent e8bd066fe9
commit 35cb4e51e4
2 changed files with 0 additions and 12 deletions

View File

@ -99,12 +99,8 @@ $(TARGET): include/version.h $(OBJ)
clean: host_clean clean: host_clean
$(Q)echo " CLEAN" $(Q)echo " CLEAN"
ifeq ($(OS), Windows_NT)
-$(Q)$(shell del *.o, *.d, blackmagic*, $(HOSTFILES))
else
-$(Q)$(RM) *.o *.d *~ blackmagic $(HOSTFILES) -$(Q)$(RM) *.o *.d *~ blackmagic $(HOSTFILES)
-$(Q)$(RM) platforms/*/*.o platforms/*/*.d mapfile include/version.h -$(Q)$(RM) platforms/*/*.o platforms/*/*.d mapfile include/version.h
endif
all_platforms: all_platforms:
$(Q)set -e ;\ $(Q)set -e ;\
@ -130,9 +126,5 @@ command.c: include/version.h
include/version.h: FORCE include/version.h: FORCE
$(Q)echo " GIT include/version.h" $(Q)echo " GIT include/version.h"
ifeq ($(OS), Windows_NT)
$(Q)echo #define FIRMWARE_VERSION "$(shell git describe --always --dirty)" > $@
else
$(Q)echo "#define FIRMWARE_VERSION \"$(shell git describe --always --dirty)\"" > $@ $(Q)echo "#define FIRMWARE_VERSION \"$(shell git describe --always --dirty)\"" > $@
endif
-include *.d -include *.d

View File

@ -34,8 +34,4 @@ blackmagic_dfu: usbdfu.o dfucore.o dfu_f1.o
$(Q)$(CC) $^ -o $@ $(LDFLAGS_BOOT) $(Q)$(CC) $^ -o $@ $(LDFLAGS_BOOT)
host_clean: host_clean:
ifeq ($(OS), Windows_NT)
-$(Q)$(shell del blackmagic.bin blackmagic_dfu blackmagic_dfu.bin blackmagic_dfu.hex)
else
-$(Q)$(RM) blackmagic.bin blackmagic_dfu blackmagic_dfu.bin blackmagic_dfu.hex -$(Q)$(RM) blackmagic.bin blackmagic_dfu blackmagic_dfu.bin blackmagic_dfu.hex
endif