From: iceman1001 <iceman@iuse.se>
Date: Fri, 20 Jan 2017 18:25:42 +0000 (+0100)
Subject: FIX:  the HID-Flasher depends on libusb to be able to compile  On OSX the 'include... 
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/360a5b1b3c94d75716ea422dbaa267d8ab39b9de

FIX:  the HID-Flasher depends on libusb to be able to compile  On OSX the 'include paths' is different when using homebrew.
This project compiles on Ubuntu with libusb-dev installed.     Lets see if it compiles on OSX....
---

diff --git a/client/hid-flasher/Makefile b/client/hid-flasher/Makefile
index 5e9b6fcd..90b29748 100644
--- a/client/hid-flasher/Makefile
+++ b/client/hid-flasher/Makefile
@@ -12,10 +12,15 @@ CXX=g++
 VPATH = ../../common
 OBJDIR = obj
 
-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
-LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=gnu99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3
+ifeq ($(platform),Darwin)
+	LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb-1.0 -lreadline -lpthread
+	CFLAGS = -std=gnu99 -I. -I../include -I../common -I/usr/local/include -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3
+else
+	LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
+	CFLAGS = -std=gnu99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3
+endif
 
+LDFLAGS = $(COMMON_FLAGS)
 CXXFLAGS =
 QTLDLIBS =
 
diff --git a/client/hid-flasher/proxusb.h b/client/hid-flasher/proxusb.h
index 842cb81d..5845888a 100644
--- a/client/hid-flasher/proxusb.h
+++ b/client/hid-flasher/proxusb.h
@@ -13,7 +13,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
-//#include <usb.h>
+#include <usb.h>
 #include "usb_cmd.h"
 
 extern unsigned char return_on_error;