adding setupAPI
This commit is contained in:
1
.github/workflows/cmake_windows_msys2.yml
vendored
1
.github/workflows/cmake_windows_msys2.yml
vendored
@@ -116,7 +116,6 @@ jobs:
|
||||
-D CMAKE_INSTALL_PREFIX=./build/artifacts
|
||||
-D QT=${{ matrix.ui.qt }}
|
||||
-D STATIC_BUILD=${{ matrix.ui.static }}
|
||||
-D CMAKE_EXE_LINKER_FLAGS="$(pkg-config --libs libserialport --static )"
|
||||
|
||||
- name: Build
|
||||
run: |
|
||||
|
||||
1
.github/workflows/codeql_windows_msys2.yml
vendored
1
.github/workflows/codeql_windows_msys2.yml
vendored
@@ -122,7 +122,6 @@ jobs:
|
||||
-D CMAKE_INSTALL_PREFIX=./build/artifacts
|
||||
-D QT=${{ matrix.ui.qt }}
|
||||
-D STATIC_BUILD=${{ matrix.ui.static }}
|
||||
-D CMAKE_EXE_LINKER_FLAGS="$(pkg-config --libs libserialport --static )"
|
||||
|
||||
- name: Build
|
||||
run: cmake --build build
|
||||
|
||||
@@ -178,13 +178,14 @@ pkg_check_modules(SERIALPORT REQUIRED libserialport)
|
||||
if(APPLE)
|
||||
include_directories(${LIBSERIALPORT_ROOT}/include)
|
||||
target_link_libraries(86Box ${LIBSERIALPORT_ROOT}/lib/libserialport.dylib)
|
||||
elseif(WIN32)
|
||||
include_directories(${SERIALPORT_INCLUDE_DIRS})
|
||||
target_link_libraries(86Box ${SERIALPORT_LIBRARIES} SetupAPI)
|
||||
else()
|
||||
include_directories(${SERIALPORT_INCLUDE_DIRS})
|
||||
target_link_libraries(86Box ${SERIALPORT_LIBRARIES})
|
||||
endif()
|
||||
if (WIN32)
|
||||
target_compile_options(86Box PUBLIC ${SERIALPORT_CFLAGS_OTHER} --static )
|
||||
endif()
|
||||
|
||||
|
||||
add_subdirectory(resid-fp)
|
||||
target_link_libraries(86Box resid-fp)
|
||||
|
||||
Reference in New Issue
Block a user