Merge pull request #2 from lostman-github/fix-makefile

fix Makefile for building on Mac
digistump · May 20, 2014 · d4eb080 · d4eb080
2 parents b035f50 + f7557a4
commit d4eb080
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/C++/monitor/Makefile b/C++/monitor/Makefile
@@ -6,7 +6,7 @@ ifeq ($(shell uname), Linux)
 	OSFLAG = -D LINUX
 else ifeq ($(shell uname), Darwin)
 	USBFLAGS = `libusb-config --cflags`
-	USBLIBS = libusb-0.1.4.dylib 
+	USBLIBS = `libusb-config --libs` -lcurses
 	EXE_SUFFIX =
 	OSFLAG = -D MAC_OS -D_DARWIN_USE_64_BIT_INODE=1
 else

diff --git a/C++/receive/Makefile b/C++/receive/Makefile
@@ -6,7 +6,7 @@ ifeq ($(shell uname), Linux)
 	OSFLAG = -D LINUX
 else ifeq ($(shell uname), Darwin)
 	USBFLAGS = `libusb-config --cflags`
-	USBLIBS = libusb-0.1.4.dylib 
+	USBLIBS = `libusb-config --libs`
 	EXE_SUFFIX =
 	OSFLAG = -D MAC_OS -D_DARWIN_USE_64_BIT_INODE=1
 else
@@ -29,4 +29,4 @@ $(PROGRAM): $(SOURCE)
 	$(CC) $(CFLAGS) -o $(PROGRAM) $(SOURCE) $(USBLIBS)
 
 clean:
-	rm -f $(PROGRAM) *.o
+	rm -f $(PROGRAM) *.o
diff --git a/C++/send/Makefile b/C++/send/Makefile
@@ -6,7 +6,7 @@ ifeq ($(shell uname), Linux)
 	OSFLAG = -D LINUX
 else ifeq ($(shell uname), Darwin)
 	USBFLAGS = `libusb-config --cflags`
-	USBLIBS = libusb-0.1.4.dylib 
+	USBLIBS = `libusb-config --libs`
 	EXE_SUFFIX =
 	OSFLAG = -D MAC_OS -D_DARWIN_USE_64_BIT_INODE=1
 else
@@ -29,4 +29,4 @@ $(PROGRAM): $(SOURCE)
 	$(CC) $(CFLAGS) -o $(PROGRAM) $(SOURCE) $(USBLIBS)
 
 clean:
-	rm -f $(PROGRAM) *.o
+	rm -f $(PROGRAM) *.o