diff --git a/.cargo/config.toml b/.cargo/config.toml index 0fad2f4b..17b0dea3 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,4 +1,4 @@ -[target.'cfg(not(target_os = "windows"))'] +[target.'cfg(target_os = "linux")'] rustflags = ["-C", "linker=clang", "-C", "link-arg=-fuse-ld=lld"] [target.'cfg(target_os = "windows")'] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 92c386dd..56f85f1a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -100,7 +100,6 @@ jobs: path: output/gopher64-${{ matrix.arch }}.exe build-macos: - if: false runs-on: macos-15 strategy: fail-fast: false diff --git a/build.rs b/build.rs index 1b67a330..42b73fe5 100644 --- a/build.rs +++ b/build.rs @@ -8,11 +8,13 @@ fn main() { let mut simd_build = cc::Build::new(); let mut volk_build = cc::Build::new(); volk_build + .std("c17") .include("parallel-rdp/parallel-rdp-standalone/vulkan-headers/include") .file("parallel-rdp/parallel-rdp-standalone/volk/volk.c"); let mut rdp_build = cc::Build::new(); rdp_build .cpp(true) + .std("c++17") .flag("-Wno-unused-parameter") .flag("-Wno-missing-field-initializers") .file("parallel-rdp/parallel-rdp-standalone/parallel-rdp/command_ring.cpp") @@ -73,6 +75,7 @@ fn main() { } else { panic!("unknown arch") }; + volk_build.flag(opt_flag); rdp_build.flag(opt_flag); simd_build.flag(opt_flag); @@ -164,11 +167,12 @@ fn main() { .write_to_file(out_path.join("simd_bindings.rs")) .expect("Couldn't write bindings!"); - simd_build.flag("-DSSE2NEON_SUPPRESS_WARNINGS"); - simd_build.file("src/compat/aarch64.c"); - simd_build.file(std::env::temp_dir().join("bindgen").join("extern.c")); - simd_build.include("."); - simd_build.compile("simd"); + simd_build + .flag("-DSSE2NEON_SUPPRESS_WARNINGS") + .file("src/compat/aarch64.c") + .file(std::env::temp_dir().join("bindgen").join("extern.c")) + .include(".") + .compile("simd"); } let git_output = std::process::Command::new("git")