From 61f82e38c68dacde484b7a6adf0d092c12a9e604 Mon Sep 17 00:00:00 2001 From: Carl Philipp Klemm Date: Tue, 16 Sep 2025 14:24:50 +0200 Subject: [PATCH] CI: Fix windows build --- .gitea/workflows/build-win.yml | 12 ++++++------ CMakeLists.txt | 6 ++++++ usbshm.c | 2 +- usbshm.h | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build-win.yml b/.gitea/workflows/build-win.yml index 049219f..57c00f9 100644 --- a/.gitea/workflows/build-win.yml +++ b/.gitea/workflows/build-win.yml @@ -6,16 +6,16 @@ jobs: Build: runs-on: ubuntu-latest steps: - - name: Get Libusb for windows - run: wget https://github.com/libusb/libusb/releases/download/v1.0.29/libusb-1.0.29.7z -o ${{ gitea.workspace }}/libusb.7z; ls ${{ gitea.workspace }} + - name: Check out repository code + uses: ischanx/checkout@8c80eac3058d03dc5301629e8f7d59ae255d6cc3 - name: Install dependancies run: | apt update apt install -y cmake mingw-w64-x86-64-dev gcc-mingw-w64 g++-mingw-w64 p7zip-full - mkdir ${{ gitea.workspace }}/libusb - 7z x ${{ gitea.workspace }}/libusb.7z -o${{ gitea.workspace }}/libusb - - name: Check out repository code - uses: ischanx/checkout@8c80eac3058d03dc5301629e8f7d59ae255d6cc3 + cd ${{ gitea.workspace }} + wget https://github.com/libusb/libusb/releases/download/v1.0.29/libusb-1.0.29.7z + mkdir libusb + 7z x libusb-1.0.29.7z -olibusb - name: Version id: version run: git fetch -a; echo "tag=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_OUTPUT diff --git a/CMakeLists.txt b/CMakeLists.txt index 551f016..b6bfaa7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,6 +57,9 @@ endif(WIN32) add_library(${PROJECT_NAME} SHARED ${SRC_FILES}) target_include_directories(${PROJECT_NAME} PUBLIC ${LIBUSB_INCLUDE_DIRS}) target_link_libraries(${PROJECT_NAME} ${LIBUSB_LIBRARIES}) +if(WIN32) + target_link_libraries(${PROJECT_NAME} libpthread.a) +endif(WIN32) target_compile_options(${PROJECT_NAME} PRIVATE -Wall -O2 -fno-strict-aliasing) install(TARGETS ${PROJECT_NAME} DESTINATION lib) install(FILES ./eismultiplexer.h DESTINATION include) @@ -64,6 +67,9 @@ install(FILES ./eismultiplexer.h DESTINATION include) add_library(${PROJECT_NAME}_static STATIC ${SRC_FILES}) target_include_directories(${PROJECT_NAME}_static PUBLIC ${LIBUSB_INCLUDE_DIRS}) target_link_libraries(${PROJECT_NAME}_static ${LIBUSB_LIBRARIES}) +if(WIN32) + target_link_libraries(${PROJECT_NAME}_static libpthread.a) +endif(WIN32) target_compile_options(${PROJECT_NAME}_static PRIVATE -Wall -O2 -fno-strict-aliasing) install(TARGETS ${PROJECT_NAME}_static DESTINATION lib) diff --git a/usbshm.c b/usbshm.c index 1eb1814..4af807b 100644 --- a/usbshm.c +++ b/usbshm.c @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include static int object_counter = 0; diff --git a/usbshm.h b/usbshm.h index 3430d22..0880507 100644 --- a/usbshm.h +++ b/usbshm.h @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include