claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding setupAPI

Browse Source
This commit is contained in:
Jose Phillips
2024-12-02 00:40:06 -05:00
parent d3a69df4d3
commit 267d4b2e02
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/cmake_windows_msys2.yml vendored
View File

@@ -116,7 +116,6 @@ jobs:
-D CMAKE_INSTALL_PREFIX=./build/artifacts -D CMAKE_INSTALL_PREFIX=./build/artifacts
-D QT=${{ matrix.ui.qt }} -D QT=${{ matrix.ui.qt }}
-D STATIC_BUILD=${{ matrix.ui.static }} -D STATIC_BUILD=${{ matrix.ui.static }}
-D CMAKE_EXE_LINKER_FLAGS="$(pkg-config --libs libserialport --static )"
- name: Build - name: Build
run: | run: |

1
.github/workflows/codeql_windows_msys2.yml vendored
View File

@@ -122,7 +122,6 @@ jobs:
-D CMAKE_INSTALL_PREFIX=./build/artifacts -D CMAKE_INSTALL_PREFIX=./build/artifacts
-D QT=${{ matrix.ui.qt }} -D QT=${{ matrix.ui.qt }}
-D STATIC_BUILD=${{ matrix.ui.static }} -D STATIC_BUILD=${{ matrix.ui.static }}
-D CMAKE_EXE_LINKER_FLAGS="$(pkg-config --libs libserialport --static )"
- name: Build - name: Build
run: cmake --build build run: cmake --build build

7
src/sound/CMakeLists.txt
View File

@@ -178,13 +178,14 @@ pkg_check_modules(SERIALPORT REQUIRED libserialport)
if(APPLE) if(APPLE)
include_directories(${LIBSERIALPORT_ROOT}/include) include_directories(${LIBSERIALPORT_ROOT}/include)
target_link_libraries(86Box ${LIBSERIALPORT_ROOT}/lib/libserialport.dylib) target_link_libraries(86Box ${LIBSERIALPORT_ROOT}/lib/libserialport.dylib)
elseif(WIN32)
include_directories(${SERIALPORT_INCLUDE_DIRS})
target_link_libraries(86Box ${SERIALPORT_LIBRARIES} SetupAPI)
else() else()
include_directories(${SERIALPORT_INCLUDE_DIRS}) include_directories(${SERIALPORT_INCLUDE_DIRS})
target_link_libraries(86Box ${SERIALPORT_LIBRARIES}) target_link_libraries(86Box ${SERIALPORT_LIBRARIES})
endif() endif()
if (WIN32)
target_compile_options(86Box PUBLIC ${SERIALPORT_CFLAGS_OTHER} --static )
endif()
add_subdirectory(resid-fp) add_subdirectory(resid-fp)
target_link_libraries(86Box resid-fp) target_link_libraries(86Box resid-fp)