From d718f47f9c32f1a07709881c57674af32f5e6ee6 Mon Sep 17 00:00:00 2001 From: toka Date: Mon, 25 Aug 2025 15:19:44 +0200 Subject: [PATCH 1/3] move to just --- .github/workflows/build_and_test.yml | 18 +++++++++--------- Makefile.toml | 13 ++++--------- 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 27725f2..d92b6b0 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -17,10 +17,10 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 - name: install cxxbridge run: cargo install cxxbridge-cmd - - name: install cargo-make - run: cargo install cargo-make + - name: install just + run: cargo install just - name: Compile test - run: cargo make build_test + run: just build_test - name: Build run: cargo build --verbose - name: Run tests @@ -31,10 +31,10 @@ jobs: - uses: actions/checkout@v3 - name: install cxxbridge run: cargo install cxxbridge-cmd - - name: install cargo-make - run: cargo install cargo-make + - name: install just + run: cargo install just - name: Compile test - run: cargo make build_test + run: just build_test - name: Build run: cargo build --verbose # - name: Run tests @@ -45,10 +45,10 @@ jobs: - uses: actions/checkout@v3 - name: install cxxbridge run: cargo install cxxbridge-cmd - - name: install cargo-make - run: cargo install cargo-make + - name: install just + run: cargo install just - name: Compile test - run: cargo make build_test + run: just build_test - name: Build run: cargo build --verbose - name: Run tests diff --git a/Makefile.toml b/Makefile.toml index fa759d1..d8a3b16 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -1,10 +1,5 @@ -[tasks.build_test] -dependencies = ["build_configure"] -cwd = "./test" -command = "cmake" -args = ["--build", "build", "--config", "Debug"] +build_configure: + cmake -S ./test -B ./test/build -DCMAKE_BUILD_TYPE=Debug -[tasks.build_configure] -cwd = "./test" -command = "cmake" -args = ["-S", ".", "-B", "build"] +build_test: build_configure + cmake --build ./test/build --config Debug From 3e83ed8f34c863035ebc6ff3f4090918c1aafb8b Mon Sep 17 00:00:00 2001 From: toka Date: Mon, 25 Aug 2025 15:22:51 +0200 Subject: [PATCH 2/3] Add justfile --- Makefile.toml => Justfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Makefile.toml => Justfile (100%) diff --git a/Makefile.toml b/Justfile similarity index 100% rename from Makefile.toml rename to Justfile From ff7d717e27c548fa0275091e79f3d7d5a19fc7a0 Mon Sep 17 00:00:00 2001 From: toka Date: Mon, 25 Aug 2025 15:32:59 +0200 Subject: [PATCH 3/3] link? --- build.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.rs b/build.rs index 0fe0a5a..a651af3 100644 --- a/build.rs +++ b/build.rs @@ -152,7 +152,10 @@ fn main() { println!("cargo:rustc-link-lib=static=reil"); #[cfg(target_os = "windows")] - println!("cargo:rustc-link-lib=dylib=dbghelp"); + { + println!("cargo:rustc-link-lib=dylib=dbghelp"); + println!("cargo:rustc-link-lib=dylib=advapi32"); + } println!("cargo:rerun-if-changed=src/"); println!("cargo:rerun-if-changed=src/tinyinst.rs");