blob: fdaadd9fd574cd6ce2109dcf5d2a28a5da501e13 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
# diff -rupN MSPDebugStack_OS_Package_orig/DLL430_v3/src/TI/DLL430/HidUpdateManager.cpp MSPDebugStack_OS_Package/DLL430_v3/src/TI/DLL430/HidUpdateManager.cpp >> hidapi.patch
--- MSPDebugStack_OS_Package_orig/DLL430_v3/src/TI/DLL430/HidUpdateManager.cpp 2015-12-04 00:21:09.997725110 -0600
+++ MSPDebugStack_OS_Package/DLL430_v3/src/TI/DLL430/HidUpdateManager.cpp 2015-12-04 00:23:29.653635140 -0600
@@ -38,7 +38,7 @@
#include <pch.h>
#include "HidUpdateManager.h"
-#include <hidapi.h>
+#include <hidapi/hidapi.h>
#include <BSL430_DLL/Connections/MSPBSL_Connection5xxUSB.h>
#include <BSL430_DLL/MSPBSL_Factory.h>
# diff -rupN MSPDebugStack_OS_Package_orig/Makefile MSPDebugStack_OS_Package/Makefile >> hidapi.patch
--- MSPDebugStack_OS_Package_orig/Makefile 2015-12-04 00:21:10.047726034 -0600
+++ MSPDebugStack_OS_Package/Makefile 2015-12-04 00:25:23.185724236 -0600
@@ -35,7 +35,7 @@ STATIC_LIBS :=
ifdef STATIC
STATIC_LIBS += -lboost_filesystem -lboost_system -lbsl430
else
-LIBS += -lboost_filesystem -lboost_system -lbsl430
+LIBS += -lboost_filesystem -lboost_system -lbsl430 -lhidapi-libusb
endif
LIBTHIRD := ./ThirdParty/lib64
@@ -124,7 +124,8 @@ SRC := \
OBJS := $(patsubst %.cpp, %.o, $(SRC))
all: $(BSLLIB) $(OBJS)
- $(CXX) $(CXXFLAGS) -shared $(OUTNAME)$(OUTPUT) -o $(OUTPUT) $(OBJS) $(HIDOBJ) $(LIBDIRS) $(BSTATIC) $(STATIC_LIBS) $(BDYNAMIC) $(LIBS)
+ #$(CXX) $(CXXFLAGS) -shared $(OUTNAME)$(OUTPUT) -o $(OUTPUT) $(OBJS) $(HIDOBJ) $(LIBDIRS) $(BSTATIC) $(STATIC_LIBS) $(BDYNAMIC) $(LIBS)
+ $(CXX) $(CXXFLAGS) -shared $(OUTNAME)$(OUTPUT) -o $(OUTPUT) $(OBJS) $(LIBDIRS) $(BSTATIC) $(STATIC_LIBS) $(BDYNAMIC) $(LIBS)
$(PCH_COMPILED): $(PCH_HEADER)
$(CXX) $(MAKE_PCH) -o $@ $< $(CXXFLAGS) $(INCLUDES) $(DEFINES)
# diff -rupN MSPDebugStack_OS_Package_orig/ThirdParty/BSL430_DLL/BSL430_DLL/Physical_Interfaces/MSPBSL_PhysicalInterfaceUSB.h MSPDebugStack_OS_Package/ThirdParty/BSL430_DLL/BSL430_DLL/Physical_Interfaces/MSPBSL_PhysicalInterfaceUSB.h >> hidapi.patch
--- MSPDebugStack_OS_Package_orig/ThirdParty/BSL430_DLL/BSL430_DLL/Physical_Interfaces/MSPBSL_PhysicalInterfaceUSB.h 2015-12-04 00:21:09.584384137 -0600
+++ MSPDebugStack_OS_Package/ThirdParty/BSL430_DLL/BSL430_DLL/Physical_Interfaces/MSPBSL_PhysicalInterfaceUSB.h 2015-12-04 00:27:14.494435240 -0600
@@ -38,7 +38,7 @@
#pragma once
-#include <hidapi.h>
+#include <hidapi/hidapi.h>
#include "MSPBSL_PhysicalInterface.h"
|