More win fixes

kiibohd · Oct 12, 2023 · 09db753 · 09db753
1 parent f73ef86
commit 09db753
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -45,7 +45,7 @@ jobs:
     - name: Install dependencies
       run: |
         brew update
-        brew install wxwidgets
+        brew install wxmac
     - name: Build
       run: |
         make -j
@@ -78,7 +78,6 @@ jobs:
           make
           binutils
           gcc
-          wxwidgets3.2
     - name: Build
       shell: msys2 {0}
       run: |

diff --git a/build.rs b/build.rs
@@ -14,7 +14,7 @@ fn main() {
         #[cfg(target_os = "macos")]
         "src/OSXPortFactory.cpp",
         "src/PortFactory.cpp",
-        #[cfg(any(target_os = "linux", target_os = "macos"))]
+        #[cfg(target_family = "unix")]
         "src/PosixSerialPort.cpp",
         "src/Samba.cpp",
         #[cfg(target_os = "windows")]
@@ -39,7 +39,7 @@ fn main() {
         #[cfg(target_os = "macos")]
         "src/OSXPortFactory.h",
         "src/PortFactory.h",
-        #[cfg(any(target_os = "linux", target_os = "macos"))]
+        #[cfg(target_family = "unix")]
         "src/PosixSerialPort.h",
         "src/Samba.h",
         "src/SerialPort.h",
@@ -67,5 +67,7 @@ fn main() {
     for rs in rs_files {
         println!("cargo:rerun-if-changed={}", rs);
     }
+    #[cfg(target_env = "msvc")]
+    build.include("src/msvc");
     build.flag_if_supported("-std=c++14").compile("bossa");
 }