diff --git a/Librador_API/___librador/demo_qt/librademo/librademo.pro b/Librador_API/___librador/demo_qt/librademo/librademo.pro index e67567cb..016af47a 100644 --- a/Librador_API/___librador/demo_qt/librademo/librademo.pro +++ b/Librador_API/___librador/demo_qt/librademo/librademo.pro @@ -60,3 +60,20 @@ unix:!android:!macx { DEFINES += \ PLATFORM_LINUX \ } + +macx { + #libusb include + LIBS += -L../../../Desktop_Interface/build_mac/libusb/lib -lusb-1.0 ##I suspect the -L here does nothing! + INCLUDEPATH += ../../../Desktop_Interface/build_mac/libusb/include/libusb-1.0 + DEPENDPATH += ../../../Desktop_Interface/build_mac/libusb/include/libusb-1.0 + + #libdfuprog include + LIBS += -L../../../Desktop_Interface/build_mac/libdfuprog/lib -ldfuprog-0.9 + INCLUDEPATH += ../../../Desktop_Interface/build_mac/libdfuprog/include + DEPENDPATH += ../../../Desktop_Interface/build_mac/libdfuprog/include + + #linux defines + DEFINES += \ + PLATFORM_MAC \ +} + diff --git a/Librador_API/___librador/librador_shared_library/librador.h b/Librador_API/___librador/librador_shared_library/librador.h index 404ba93a..657eb645 100644 --- a/Librador_API/___librador/librador_shared_library/librador.h +++ b/Librador_API/___librador/librador_shared_library/librador.h @@ -8,7 +8,7 @@ int LIBRADORSHARED_EXPORT librador_init(); int LIBRADORSHARED_EXPORT librador_exit(); int LIBRADORSHARED_EXPORT librador_setup_usb(); -//int LIBRADORSHARED_EXPORT librador_reset_usb(); +int LIBRADORSHARED_EXPORT librador_reset_usb(); //Control //a0 int LIBRADORSHARED_EXPORT librador_avr_debug();