diff --git a/.gitea/workflows/build-win.yml b/.gitea/workflows/build-win.yml index 99fc459..57c00f9 100644 --- a/.gitea/workflows/build-win.yml +++ b/.gitea/workflows/build-win.yml @@ -6,6 +6,8 @@ jobs: Build: runs-on: ubuntu-latest steps: + - name: Check out repository code + uses: ischanx/checkout@8c80eac3058d03dc5301629e8f7d59ae255d6cc3 - name: Install dependancies run: | apt update @@ -14,8 +16,6 @@ jobs: 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: Check out repository code - uses: ischanx/checkout@8c80eac3058d03dc5301629e8f7d59ae255d6cc3 - 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)