diff --git a/.cargo/config.toml b/.cargo/config.toml index d47f983e..4616de15 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,11 +1,11 @@ [target.x86_64-apple-darwin] -rustflags = [ - "-C", "link-arg=-undefined", - "-C", "link-arg=dynamic_lookup", -] +rustflags = ["-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup"] [target.aarch64-apple-darwin] -rustflags = [ - "-C", "link-arg=-undefined", - "-C", "link-arg=dynamic_lookup", -] +rustflags = ["-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup"] + +[target.x86_64-pc-windows-msvc] +rustflags = ["-C", "link-args=/FORCE:MULTIPLE"] + +[target.aarch64-pc-windows-msvc] +rustflags = ["-C", "link-args=/FORCE:MULTIPLE"] diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5e2cb3f..cc764386 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,11 +34,16 @@ jobs: with: neovim: true version: ${{ matrix.neovim }} + - name: Install libluajit (Linux) + if: runner.os == 'Linux' + run: sudo apt-get update && sudo apt-get install -y libluajit-5.1-dev + - name: Install libluajit (macOS) + if: runner.os == 'macOS' + run: brew install luajit - name: Install latest stable `rustc` uses: dtolnay/rust-toolchain@stable - name: Run tests run: cargo test --workspace ${{ matrix.features }} - working-directory: . clippy: name: clippy diff --git a/tests/Cargo.toml b/tests/Cargo.toml index b06792a1..fb378717 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -21,7 +21,7 @@ thiserror = { workspace = true } nvim-oxi = { path = "..", features = ["libuv", "mlua", "test"] } [target.'cfg(any(target_os = "windows", target_env = "msvc"))'.dependencies] -nvim-oxi = { path = "..", features = ["mlua", "test"] } +nvim-oxi = { path = "..", features = ["mlua", "test", "__vendored_luajit"] } [build-dependencies] nvim-oxi = { path = "..", features = ["test"] }