From 267d4b2e022fd97e91aa6fbd131b69e1858ab5b1 Mon Sep 17 00:00:00 2001
From: Jose Phillips <jose@latinol.com>
Date: Mon, 2 Dec 2024 00:40:06 -0500
Subject: [PATCH] adding setupAPI

---
 .github/workflows/cmake_windows_msys2.yml  | 1 -
 .github/workflows/codeql_windows_msys2.yml | 1 -
 src/sound/CMakeLists.txt                   | 7 ++++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml
index d5d3e8200..e55e1c1f7 100644
--- a/.github/workflows/cmake_windows_msys2.yml
+++ b/.github/workflows/cmake_windows_msys2.yml
@@ -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: |
diff --git a/.github/workflows/codeql_windows_msys2.yml b/.github/workflows/codeql_windows_msys2.yml
index 7382f503c..7a0055910 100644
--- a/.github/workflows/codeql_windows_msys2.yml
+++ b/.github/workflows/codeql_windows_msys2.yml
@@ -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
diff --git a/src/sound/CMakeLists.txt b/src/sound/CMakeLists.txt
index 4837d76ac..315da61e4 100644
--- a/src/sound/CMakeLists.txt
+++ b/src/sound/CMakeLists.txt
@@ -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)