/make/arduino-mk

To get this branch, use:
bzr branch http://bzr.ed.am/make/arduino-mk

« back to all changes in this revision

Viewing changes to arduino.mk

  • Committer: edam
  • Date: 2012-10-22 16:47:36 UTC
  • Revision ID: tim@ed.am-20121022164736-86ja3l4r7tl9jr4y
use a more sensible command-line oprdering when linking

Show diffs side-by-side

added added

removed removed

Lines of Context:
arduino.mk
234
234
        $(shell sed -ne "s/$(BOARD).upload.speed=\(.*\)/\1/p" $(BOARDS_FILE))
235
235
BOARD_UPLOAD_PROTOCOL := \
236
236
        $(shell sed -ne "s/$(BOARD).upload.protocol=\(.*\)/\1/p" $(BOARDS_FILE))
237
 
BOARD_USB_VID := \
238
 
        $(shell sed -ne "s/$(BOARD).build.vid=\(.*\)/\1/p" $(BOARDS_FILE))
239
 
BOARD_USB_PID := \
240
 
        $(shell sed -ne "s/$(BOARD).build.pid=\(.*\)/\1/p" $(BOARDS_FILE))
241
237
 
242
238
# invalid board?
243
239
ifeq "$(BOARD_BUILD_MCU)" ""
253
249
CPPFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums
254
250
CPPFLAGS += -mmcu=$(BOARD_BUILD_MCU)
255
251
CPPFLAGS += -DF_CPU=$(BOARD_BUILD_FCPU) -DARDUINO=$(ARDUINOCONST)
256
 
CPPFLAGS += -DUSB_VID=$(BOARD_USB_VID) -DUSB_PID=$(BOARD_USB_PID)
257
252
CPPFLAGS += -I. -Iutil -Iutility -I $(ARDUINOCOREDIR)
258
253
CPPFLAGS += -I $(ARDUINODIR)/hardware/arduino/variants/$(BOARD_BUILD_VARIANT)/
259
254
CPPFLAGS += $(addprefix -I $(ARDUINODIR)/libraries/, $(LIBRARIES))