dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make runscript_if_exists() more Windows friendly

Browse source
This commit is contained in:
Julien Ridoux 2014-03-17 10:02:09 +11:00
parent 6c56c4bf14
commit 19334b8cf5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Arduino.mk
View file

@ -1110,7 +1110,7 @@ $(OBJDIR): pre-build
$(MKDIR) $(OBJDIR) $(MKDIR) $(OBJDIR)
pre-build: pre-build:
$(call runscript_if_exists,$(PRE_BUILD_HOOK)) $(call runscript_if_exists,$(CURDIR)/$(PRE_BUILD_HOOK))
$(TARGET_ELF): $(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS) $(TARGET_ELF): $(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS)
$(CC) $(LDFLAGS) -o $@ $(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS) -lc -lm $(CC) $(LDFLAGS) -o $@ $(LOCAL_OBJS) $(CORE_LIB) $(OTHER_OBJS) -lc -lm

2
Common.mk
View file

@ -5,7 +5,7 @@
dir_if_exists = $(if $(wildcard $(1)$(2)),$(1)) dir_if_exists = $(if $(wildcard $(1)$(2)),$(1))
# Run a shell script if it exists. # Run a shell script if it exists.
runscript_if_exists = $(if $(wildcard $(1)), $(shell sh $(1))) runscript_if_exists = $(if $(wildcard $(1)), $(shell $(1)))
# For message printing: pad the right side of the first argument with spaces to # For message printing: pad the right side of the first argument with spaces to
# the number of bytes indicated by the second argument. # the number of bytes indicated by the second argument.