Merge pull request #1142 from Biswa96/fix-mingw-install

cmake: Install shared libraries in proper directories.
stlink-org · May 18, 2021 · c7dd173 · c7dd173
2 parents f5ada94 + 553713d
commit c7dd173
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -194,8 +194,11 @@ else ()
     target_link_libraries(${STLINK_LIB_SHARED} ${LIBUSB_LIBRARY} ${SSP_LIB})
 endif ()
 
-install(TARGETS ${STLINK_LIB_SHARED} DESTINATION ${STLINK_LIBRARY_PATH})
-
+install(TARGETS ${STLINK_LIB_SHARED}
+        ARCHIVE DESTINATION ${STLINK_LIBRARY_PATH}
+        LIBRARY DESTINATION ${STLINK_LIBRARY_PATH}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        )
 
 ###
 # Static library

diff --git a/src/win32/win32_socket.c b/src/win32/win32_socket.c
@@ -70,7 +70,7 @@ int win32_poll(struct pollfd *fds, unsigned int nfds, int timo) {
 
     if (rc > 0) {
         for ( i = 0; i < nfds; ++i) {
-            int fd = fds[i].fd;
+            SOCKET fd = fds[i].fd;
 
             if (fds[i].events & (POLLIN | POLLPRI) && FD_ISSET(fd, &ifds)) {
                 fds[i].revents |= POLLIN;