FIX: the HID-Flasher depends on libusb to be able to compile On OSX the 'include...

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 5e9b6fcde6efe4b1a0e97fa8a44c7e68e9972048..90b29748fd84dcf620073cc9f6c5607da5976479 100644 (file)
--- a/client/hid-flasher/Makefile
+++ b/client/hid-flasher/Makefile
@@ -12,10 +12,15 @@ CXX=g++
 VPATH = ../../common
 OBJDIR = obj
 
 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 =
 
 CXXFLAGS =
 QTLDLIBS =
 

diff --git a/client/hid-flasher/proxusb.h b/client/hid-flasher/proxusb.h
index 842cb81df48a8d6f60434dd6238f70cfac7d515c..5845888a539af7ea01b200f815ffe8b23cc809c5 100644 (file)
--- a/client/hid-flasher/proxusb.h
+++ b/client/hid-flasher/proxusb.h
@@ -13,7 +13,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
 
 #include <stdint.h>
 #include <stdbool.h>

-//#include <usb.h>
+#include <usb.h>

 #include "usb_cmd.h"
 
 extern unsigned char return_on_error;
 #include "usb_cmd.h"
 
 extern unsigned char return_on_error;