summaryrefslogtreecommitdiffstats
path: root/commandline/Makefile
diff options
context:
space:
mode:
authorTim <cpldcpu@gmail.com>2013-12-17 13:33:55 -0800
committerTim <cpldcpu@gmail.com>2013-12-17 13:33:55 -0800
commita0bd6dc787a5a0c3b5ef2710cf66bfa12668bbce (patch)
tree888bede2dfd852f790f8cfbf904c8b9d7dda89b9 /commandline/Makefile
parentbd22f84cfae23f84a2d2fee343b937794942b0f1 (diff)
parentde666eec6a939eb7034d6f6c9bf7a22ede463303 (diff)
downloadmicronucleus-a0bd6dc787a5a0c3b5ef2710cf66bfa12668bbce.tar.gz
micronucleus-a0bd6dc787a5a0c3b5ef2710cf66bfa12668bbce.tar.bz2
micronucleus-a0bd6dc787a5a0c3b5ef2710cf66bfa12668bbce.zip
Merge pull request #39 from sodabrew/commandline_warnings
Commandline warnings
Diffstat (limited to 'commandline/Makefile')
-rw-r--r--commandline/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/commandline/Makefile b/commandline/Makefile
index af9a9ee..b5bea87 100644
--- a/commandline/Makefile
+++ b/commandline/Makefile
@@ -1,17 +1,17 @@
# Makefile initially writen for Little-Wire by Omer Kilic <omerkilic@gmail.com>
-# Later on modified by ihsan Kehribar <ihsan@kehribar.me> for Micronucleus bootloader application.
+# Later on modified by ihsan Kehribar <ihsan@kehribar.me> for Micronucleus bootloader application.
CC=gcc
# FIXME: Need to add OSX stuff
ifeq ($(shell uname), Linux)
- USBFLAGS = `libusb-config --cflags`
- USBLIBS = `libusb-config --libs`
+ USBFLAGS=$(shell libusb-config --cflags)
+ USBLIBS=$(shell libusb-config --libs)
EXE_SUFFIX =
OSFLAG = -D LINUX
else ifeq ($(shell uname), Darwin)
- USBFLAGS = `libusb-config --cflags`
- USBLIBS = `libusb-config --libs`
+ USBFLAGS=$(shell libusb-config --cflags || libusb-legacy-config --cflags)
+ USBLIBS=$(shell libusb-config --libs || libusb-legacy-config --libs)
EXE_SUFFIX =
OSFLAG = -D MAC_OS
else
@@ -36,7 +36,7 @@ library: $(LWLIBS)
$(LWLIBS):
@echo Building library: $@...
- $(CC) $(CFLAGS) -c library/$@.c
+ $(CC) $(CFLAGS) -c library/$@.c
$(EXAMPLES): $(addsuffix .o, $(LWLIBS))
@echo Building example: $@...