aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorPerry Hung <iperry@alum.mit.edu>2010-03-22 23:37:50 -0400
committerPerry Hung <iperry@alum.mit.edu>2010-03-22 23:37:50 -0400
commit96ce013f875c918a70644ad23a03f0450a7f6848 (patch)
treec6bbaf93bbda4a4b7fb6bbf5805a6c4e13081e25 /Makefile
parent76e746273c8fb0dc8952a04de87ff23c14916466 (diff)
parentb9dc0877500de4164f99acc7b269fbddfe5502d3 (diff)
downloadlibrambutan-96ce013f875c918a70644ad23a03f0450a7f6848.tar.gz
librambutan-96ce013f875c918a70644ad23a03f0450a7f6848.zip
Merge branch 'master' of git@github.com:leaflabs/maple-library
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 9 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4d3f54c..17b5730 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,15 @@ AS := arm-none-eabi-as
CP := arm-none-eabi-objcopy
OD := arm-none-eabi-objdump
-#todo: use an OS switch here to grab a different bin
-DFU = ../dfu-util/bin/linux/dfu-util
+# Platform detection
+ARCH = $(shell uname -m)
+OS = $(shell uname)
+
+ifeq ($(OS),Linux)
+ DFU = dfu-util
+else
+ DFU = ../dfu-util/bin/linux/dfu-util
+endif
BUILD_PATH = build
LIB_PATH = lib