Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
5 changes: 5 additions & 0 deletions Justfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
build_configure:
cmake -S ./test -B ./test/build -DCMAKE_BUILD_TYPE=Debug

build_test: build_configure
cmake --build ./test/build --config Debug
10 changes: 0 additions & 10 deletions Makefile.toml

This file was deleted.

5 changes: 4 additions & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
Loading