diff options
Diffstat (limited to 'devel/arduino-mk/files/patch-arduino-mk-Arduino.mk')
| -rw-r--r-- | devel/arduino-mk/files/patch-arduino-mk-Arduino.mk | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/devel/arduino-mk/files/patch-arduino-mk-Arduino.mk b/devel/arduino-mk/files/patch-arduino-mk-Arduino.mk new file mode 100644 index 000000000000..c695d37cf8aa --- /dev/null +++ b/devel/arduino-mk/files/patch-arduino-mk-Arduino.mk @@ -0,0 +1,52 @@ +--- arduino-mk/Arduino.mk.orig 2012-09-17 10:41:19.000000000 -0700 ++++ arduino-mk/Arduino.mk 2012-09-17 19:21:52.000000000 -0700 +@@ -160,7 +160,7 @@ + # + # ARDUINO_LIBS - A list of any libraries used by the sketch (we + # assume these are in +-# $(ARDUINO_DIR)/hardware/libraries ++# $(ARDUINO_DIR)/libraries + # + # ARDUINO_PORT - The port where the Arduino can be found (only needed + # when uploading +@@ -287,7 +287,7 @@ + # + # Arduino version number + ifndef ARDUINO_VERSION +-ARDUINO_VERSION = 100 ++ARDUINO_VERSION = %%ARDUINO%% + endif + + ######################################################################## +@@ -448,12 +448,12 @@ + ######################################################################## + # Local sources + # +-LOCAL_C_SRCS = $(wildcard *.c) +-LOCAL_CPP_SRCS = $(wildcard *.cpp) +-LOCAL_CC_SRCS = $(wildcard *.cc) +-LOCAL_PDE_SRCS = $(wildcard *.pde) +-LOCAL_INO_SRCS = $(wildcard *.ino) +-LOCAL_AS_SRCS = $(wildcard *.S) ++LOCAL_C_SRCS ?= $(wildcard *.c) ++LOCAL_CPP_SRCS ?= $(wildcard *.cpp) ++LOCAL_CC_SRCS ?= $(wildcard *.cc) ++LOCAL_PDE_SRCS ?= $(wildcard *.pde) ++LOCAL_INO_SRCS ?= $(wildcard *.ino) ++LOCAL_AS_SRCS ?= $(wildcard *.S) + LOCAL_OBJ_FILES = $(LOCAL_C_SRCS:.c=.o) $(LOCAL_CPP_SRCS:.cpp=.o) \ + $(LOCAL_CC_SRCS:.cc=.o) $(LOCAL_PDE_SRCS:.pde=.o) \ + $(LOCAL_INO_SRCS:.ino=.o) $(LOCAL_AS_SRCS:.S=.o) +@@ -593,7 +593,11 @@ + + # the pde -> cpp -> o file + $(OBJDIR)/%.cpp: %.pde +- $(ECHO) '#include "WProgram.h"' > $@ ++ $(ECHO) '#if ARDUINO >= 100' > $@ ++ $(ECHO) '#include "Arduino.h"' >> $@ ++ $(ECHO) '#else' >> $@ ++ $(ECHO) '#include "WProgram.h"' >> $@ ++ $(ECHO) '#endif' >> $@ + $(CAT) $< >> $@ + + # the ino -> cpp -> o file |