File libusbnet-git.diff of Package libusbnet

Overview Repositories Revisions Requests Users Attributes Meta

File libusbnet-git.diff of Package libusbnet

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ba2660..614537f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,2 +32,5 @@ include(${CMAKE_MODULE_PATH}/Doxygen.cmake)
 
+# Set library prefixes
+SET(LIBDIR "lib${LIB_SUFFIX}")
+
 # Subdirectories
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0347e71..e075a8f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,3 +28,3 @@ add_library(usbnet SHARED ${sources} ${headers})
 # Dependencies
-target_link_libraries(usbnet ${CMAKE_THREAD_LIBS_INIT} ${LIBUSB_LIBRARIES} urpc)
+target_link_libraries(usbnet ${LIBUSB_LIBRARIES} urpc)
 
@@ -32,3 +32,3 @@ target_link_libraries(usbnet ${CMAKE_THREAD_LIBS_INIT} ${LIBUSB_LIBRARIES} urpc)
 install( TARGETS usbnet
-         LIBRARY DESTINATION lib
+         LIBRARY DESTINATION ${LIBDIR}
          )
diff --git a/src/proto/CMakeLists.txt b/src/proto/CMakeLists.txt
index 4ac9e16..47038b7 100644
--- a/src/proto/CMakeLists.txt
+++ b/src/proto/CMakeLists.txt
@@ -28,3 +28,3 @@ add_library(urpc_pp SHARED ${sources} ${headers})
 install( TARGETS urpc urpc_pp
-         LIBRARY DESTINATION lib
+         LIBRARY DESTINATION ${LIBDIR}
          )
diff --git a/src/proto/protocol.c b/src/proto/protocol.c
index 1e122ec..7ec29e6 100644
--- a/src/proto/protocol.c
+++ b/src/proto/protocol.c
@@ -88,3 +88,3 @@ uint32_t pkt_recv(int fd, Packet* dst)
    if((pending + size) > dst->bufsize) {
-      err_msg("packet bufsize too small, bufsize: %u packet size: %u.", dst->bufsize, pending + size);
+      error_msg("packet bufsize too small, bufsize: %u packet size: %u.", dst->bufsize, pending + size);
       exit(1);
diff --git a/src/proto/protocol.cpp b/src/proto/protocol.cpp
index 3ebe45b..ba050cb 100644
--- a/src/proto/protocol.cpp
+++ b/src/proto/protocol.cpp
@@ -93,2 +93,3 @@ Struct& Struct::addData(const char* data, size_t size, uint8_t type)
    append(data, size);
+   return *this;
 }

Places

File libusbnet-git.diff of Package libusbnet

Places