Move BonDriver files (#77)

kazuki0824 · Sep 17, 2023 · 5c66e0e · 5c66e0e
1 parent 0e82a04
commit 5c66e0e
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile
@@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         libpcsclite-dev \
         pkg-config && \
     rm -rf /var/lib/apt/lists/*
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain beta -y && \
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y && \
     /root/.cargo/bin/cargo install cargo-deb
 COPY . /src/
 WORKDIR /src/
diff --git a/recisdb-rs/build.rs b/recisdb-rs/build.rs
@@ -20,7 +20,7 @@ fn main() {
         let bg = bindgen::builder()
             .allowlist_type("IBonDriver[1-9]?")
             .allowlist_function("CreateBonDriver")
-            .header("src/IBonDriver.hpp")
+            .header("src/tuner/windows/IBonDriver.hpp")
             .dynamic_library_name("BonDriver")
             .dynamic_link_require_all(true)
             .parse_callbacks(Box::new(bindgen::CargoCallbacks));
@@ -38,7 +38,10 @@ fn main() {
 
     let mut compiler = cc::Build::new();
 
-    let globs = &["src/IBonDriver.cpp", "src/vtable_resolver/*.cpp"];
+    let globs = &[
+        "src/tuner/windows/IBonDriver.cpp",
+        "src/tuner/windows/vtable_resolver/*.cpp",
+    ];
     for pattern in globs {
         for path in glob::glob(pattern).unwrap() {
             let path = path.unwrap();

diff --git a/recisdb-rs/src/IBonDriver.cpp → recisdb-rs/src/tuner/windows/IBonDriver.cpp b/recisdb-rs/src/IBonDriver.cpp → recisdb-rs/src/tuner/windows/IBonDriver.cpp
diff --git a/recisdb-rs/src/IBonDriver.hpp → recisdb-rs/src/tuner/windows/IBonDriver.hpp b/recisdb-rs/src/IBonDriver.hpp → recisdb-rs/src/tuner/windows/IBonDriver.hpp
diff --git a/...db-rs/src/vtable_resolver/IBonDriver1.cpp → ...r/windows/vtable_resolver/IBonDriver1.cpp b/...db-rs/src/vtable_resolver/IBonDriver1.cpp → ...r/windows/vtable_resolver/IBonDriver1.cpp
diff --git a/...db-rs/src/vtable_resolver/IBonDriver2.cpp → ...r/windows/vtable_resolver/IBonDriver2.cpp b/...db-rs/src/vtable_resolver/IBonDriver2.cpp → ...r/windows/vtable_resolver/IBonDriver2.cpp
diff --git a/...db-rs/src/vtable_resolver/IBonDriver3.cpp → ...r/windows/vtable_resolver/IBonDriver3.cpp b/...db-rs/src/vtable_resolver/IBonDriver3.cpp → ...r/windows/vtable_resolver/IBonDriver3.cpp