Use $(ARDMK_DIR) for 1.6 files
Signed-off-by: Osamu Aoki <osamu@debian.org>
This commit is contained in:
parent
9357f7d3ab
commit
ce088e097d
4 changed files with 4 additions and 4 deletions
|
@ -54,6 +54,6 @@ BOARD_TAG = attiny85
|
||||||
# ------------------------------------------------------------------ #
|
# ------------------------------------------------------------------ #
|
||||||
|
|
||||||
# Path to the Arduino Makefile
|
# Path to the Arduino Makefile
|
||||||
include /usr/share/arduino/Arduino.mk
|
include $(ARDMK_DIR)/Arduino.mk
|
||||||
|
|
||||||
# !!! Important. You have to use 'make ispload' when using an ISP.
|
# !!! Important. You have to use 'make ispload' when using an ISP.
|
||||||
|
|
|
@ -15,7 +15,7 @@ TOGGLE_ARCHIVE = build-$(BOARD_TAG)/libtoggle.a
|
||||||
CXXFLAGS += -IToggle
|
CXXFLAGS += -IToggle
|
||||||
OTHER_OBJS = Toggle/$(TOGGLE_ARCHIVE)
|
OTHER_OBJS = Toggle/$(TOGGLE_ARCHIVE)
|
||||||
|
|
||||||
include ../../Arduino.mk
|
include $(ARDMK_DIR)/Arduino.mk
|
||||||
|
|
||||||
Toggle/$(TOGGLE_ARCHIVE):
|
Toggle/$(TOGGLE_ARCHIVE):
|
||||||
$(MAKE) -C Toggle $(TOGGLE_ARCHIVE)
|
$(MAKE) -C Toggle $(TOGGLE_ARCHIVE)
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
# and archived into the build-$(BOARD_TAG)/libtoggle.a target.
|
# and archived into the build-$(BOARD_TAG)/libtoggle.a target.
|
||||||
|
|
||||||
include ../board.mk
|
include ../board.mk
|
||||||
include ../../../Arduino.mk
|
include $(ARDMK_DIR)/Arduino.mk
|
||||||
|
|
||||||
build-$(BOARD_TAG)/libtoggle.a: $(LOCAL_OBJS)
|
build-$(BOARD_TAG)/libtoggle.a: $(LOCAL_OBJS)
|
||||||
$(AR) rcs $@ $(LOCAL_OBJS)
|
$(AR) rcs $@ $(LOCAL_OBJS)
|
||||||
|
|
|
@ -52,5 +52,5 @@ ARDUINO_SKETCHBOOK = $(HOME)/sketchbook
|
||||||
ALTERNATE_CORE = sparkfun
|
ALTERNATE_CORE = sparkfun
|
||||||
BOARD_TAG = promicro
|
BOARD_TAG = promicro
|
||||||
BOARD_SUB = 8MHzatmega32U4
|
BOARD_SUB = 8MHzatmega32U4
|
||||||
include /usr/share/arduino/Arduino.mk
|
include $(ARDMK_DIR)/Arduino.mk
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue