diff -ur libmsp430-src-orig/DLL430_v3/src/DLL430_OldApiV3.cpp libmsp430-src/DLL430_v3/src/DLL430_OldApiV3.cpp --- libmsp430-src-orig/DLL430_v3/src/DLL430_OldApiV3.cpp 2018-07-24 09:16:20.927974552 +1200 +++ libmsp430-src/DLL430_v3/src/DLL430_OldApiV3.cpp 2018-07-24 09:18:45.604227945 +1200 @@ -3865,7 +3865,7 @@ #endif UpdateLog.append("\n---------------------Firmware upate end--------------------------\n"); - ofstream(logfile.c_str(), ios::app | ios::out) << UpdateLog; + std::ofstream(logfile.c_str(), ios::app | ios::out) << UpdateLog; } } @@ -3907,7 +3907,7 @@ #endif UpdateLog.append("\n---------------------Firmware upate end--------------------------\n"); - ofstream(logfile.c_str(), ios::app | ios::out) << UpdateLog; + std::ofstream(logfile.c_str(), ios::app | ios::out) << UpdateLog; } } } diff -ur libmsp430-src-orig/DLL430_v3/src/TI/DLL430/UpdateManagerFet.cpp libmsp430-src/DLL430_v3/src/TI/DLL430/UpdateManagerFet.cpp --- libmsp430-src-orig/DLL430_v3/src/TI/DLL430/UpdateManagerFet.cpp 2018-07-24 09:16:20.959974636 +1200 +++ libmsp430-src/DLL430_v3/src/TI/DLL430/UpdateManagerFet.cpp 2018-07-24 09:49:48.189184415 +1200 @@ -52,6 +52,7 @@ #include "WatchdogControl.h" #include "DeviceHandleMSP430.h" #include "HidUpdateManager.h" +#include "MSP_FetFpgaHal.h" #include "Record.h" #include "MemoryContent.h" diff -ur libmsp430-src-orig/Makefile libmsp430-src/Makefile --- libmsp430-src-orig/Makefile 2018-07-24 09:16:20.763974121 +1200 +++ libmsp430-src/Makefile 2018-07-24 10:07:36.506228181 +1200 @@ -1,4 +1,5 @@ -CXXFLAGS := -fPIC -std=c++0x -fvisibility=hidden -fvisibility-inlines-hidden +CXXFLAGS := -fPIC -std=c++0x -fvisibility=hidden -fvisibility-inlines-hidden \ + -I/usr/include/hidapi PCH_HEADER := ./DLL430_v3/src/TI/DLL430/pch.h PCH_COMPILED := ./DLL430_v3/src/TI/DLL430/pch.h.gch @@ -74,7 +75,7 @@ BSTATIC := -Wl,-Bstatic BDYNAMIC := -Wl,-Bdynamic - HIDOBJ := $(LIBTHIRD)/hid-libusb.o + HIDOBJ := -lhidapi-libusb else CXX:= clang++ @@ -146,8 +147,11 @@ install: cp $(OUTPUT) /usr/local/lib/ + ldconfig clean: $(MAKE) -C ./ThirdParty/BSL430_DLL clean @for i in $(OBJS); do rm -f $$i; done @rm -f $(PCH_HEADER).?ch build.log + rm -f $(STATICOUTPUT).a + rm -f $(OUTPUT) Only in libmsp430-src-orig/ThirdParty/BSL430_DLL/BSL430_DLL: pch.h.gch diff -ur libmsp430-src-orig/ThirdParty/BSL430_DLL/Makefile libmsp430-src/ThirdParty/BSL430_DLL/Makefile --- libmsp430-src-orig/ThirdParty/BSL430_DLL/Makefile 2018-07-24 09:16:20.995974731 +1200 +++ libmsp430-src/ThirdParty/BSL430_DLL/Makefile 2018-07-24 10:09:28.817579798 +1200 @@ -1,4 +1,5 @@ -CXXFLAGS := -fPIC -std=c++0x -fvisibility=hidden -fvisibility-inlines-hidden +CXXFLAGS := -fPIC -std=c++0x -fvisibility=hidden -fvisibility-inlines-hidden \ + -I/usr/include/hidapi PCH_HEADER := ./BSL430_DLL/pch.h PCH_COMPILED := ./BSL430_DLL/pch.h.gch