summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim <cpldcpu@gmail.com>2014-01-14 13:32:55 -0800
committerTim <cpldcpu@gmail.com>2014-01-14 13:32:55 -0800
commitffc5e57c9b1a43354c93f113d1bb04933263da88 (patch)
tree636b5ed1bad6e83b1378b6397cb559f7a3a29414
parentfe251a68175a6db7fdb938c6d33f8b7468681c51 (diff)
parent533eeb8d482b04b84c83b1c7d46ef4f3859142d2 (diff)
downloadmicronucleus-ffc5e57c9b1a43354c93f113d1bb04933263da88.tar.gz
micronucleus-ffc5e57c9b1a43354c93f113d1bb04933263da88.tar.bz2
micronucleus-ffc5e57c9b1a43354c93f113d1bb04933263da88.zip
Merge pull request #42 from sodabrew/testing
Commandline tool build for OS X
-rw-r--r--commandline/Makefile10
-rwxr-xr-xcommandline/builds/OSX/micronucleusbin0 -> 124292 bytes
2 files changed, 8 insertions, 2 deletions
diff --git a/commandline/Makefile b/commandline/Makefile
index 5d7a410..3c52cb4 100644
--- a/commandline/Makefile
+++ b/commandline/Makefile
@@ -3,7 +3,6 @@
CC=gcc
-# FIXME: Need to add OSX stuff
ifeq ($(shell uname), Linux)
USBFLAGS=$(shell libusb-config --cflags)
USBLIBS=$(shell libusb-config --libs)
@@ -14,6 +13,13 @@ else ifeq ($(shell uname), Darwin)
USBLIBS=$(shell libusb-config --libs || libusb-legacy-config --libs)
EXE_SUFFIX =
OSFLAG = -D MAC_OS
+ # Uncomment these to create a static binary:
+ # USBLIBS = /opt/local/lib/libusb-legacy/libusb-legacy.a
+ # USBLIBS += -mmacosx-version-min=10.5
+ # USBLIBS += -framework CoreFoundation
+ # USBLIBS += -framework IOKit
+ # Uncomment these to create a dual architecture binary:
+ # OSFLAG += -arch x86_64 -arch i386
else
USBFLAGS = -I C:\MinGW\include
USBLIBS = -L C:\MinGW\lib -lusb
@@ -41,7 +47,7 @@ $(LWLIBS):
$(EXAMPLES): $(addsuffix .o, $(LWLIBS))
@echo Building command line tool: $@...
$(CC) $(CFLAGS) -o $@$(EXE_SUFFIX) $@.c $^ $(LIBS)
-
+
clean:
rm -f $(EXAMPLES)$(EXE_SUFFIX) *.o *.exe
diff --git a/commandline/builds/OSX/micronucleus b/commandline/builds/OSX/micronucleus
new file mode 100755
index 0000000..3ae62c4
--- /dev/null
+++ b/commandline/builds/OSX/micronucleus
Binary files differ