From e1db4401ca01fd5a113e49acdbe8b0148c45c0e7 Mon Sep 17 00:00:00 2001 From: maniacbug Date: Fri, 1 Apr 2011 22:57:01 -0700 Subject: [PATCH] Make the makefile be smart about which OS it's running, and make environmental changes as appropriate --- examples/pingpair/makefile | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/examples/pingpair/makefile b/examples/pingpair/makefile index 52db900..55a4885 100644 --- a/examples/pingpair/makefile +++ b/examples/pingpair/makefile @@ -57,17 +57,29 @@ AVRDUDE_PROTOCOL = stk500v1 COM = 33 endif -ARDUINO_VERSION = 22 -PROJECT_NAME = $(notdir $(PWD)) -PROJECT_DIR = . +UNAME := $(shell uname) + +ifeq ($(UNAME),Darwin) +ARDUINO_VERSION = 21 +ARDUINO_DIR = /opt/arduino-00$(ARDUINO_VERSION) +AVR_TOOLS_PATH = $(ARDUINO_DIR)/hardware/tools/avr/bin +AVRDUDECONFIG_PATH = $(ARDUINO_DIR)/hardware/tools/avr/etc +PORT = /dev/tty.usbserial-A600eHIs +PORT2 = /dev/tty.usbserial-A9007LmI +else +ARDUINO_VERSION = 22 ARDUINO_DIR = /opt/arduino-00$(ARDUINO_VERSION) -ARDUINO_CORE = $(ARDUINO_DIR)/hardware/arduino/cores/arduino -ARDUINO_AVR = $(ARDUINO_DIR)/hardware/tools/avr/avr/include/avr -ARDUINO_LIB = $(ARDUINO_DIR)/libraries AVR_TOOLS_PATH = /usr/bin AVRDUDECONFIG_PATH = $(ARDUINO_DIR)/hardware/tools PORT = /dev/ttyUSB0 PORT2 = /dev/ttyUSB1 +endif + +PROJECT_NAME = $(notdir $(PWD)) +PROJECT_DIR = . +ARDUINO_CORE = $(ARDUINO_DIR)/hardware/arduino/cores/arduino +ARDUINO_AVR = $(ARDUINO_DIR)/hardware/tools/avr/avr/include/avr +ARDUINO_LIB = $(ARDUINO_DIR)/libraries F_CPU = 16000000 ##########################################################