Skip to content

Commit 24ae626

Browse files
authored
Move from cargo-make to just (#17)
* move to just * Add justfile * link?
1 parent 984bcb0 commit 24ae626

File tree

4 files changed

+18
-20
lines changed

4 files changed

+18
-20
lines changed

.github/workflows/build_and_test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
- uses: ilammy/msvc-dev-cmd@v1
1818
- name: install cxxbridge
1919
run: cargo install cxxbridge-cmd
20-
- name: install cargo-make
21-
run: cargo install cargo-make
20+
- name: install just
21+
run: cargo install just
2222
- name: Compile test
23-
run: cargo make build_test
23+
run: just build_test
2424
- name: Build
2525
run: cargo build --verbose
2626
- name: Run tests
@@ -31,10 +31,10 @@ jobs:
3131
- uses: actions/checkout@v3
3232
- name: install cxxbridge
3333
run: cargo install cxxbridge-cmd
34-
- name: install cargo-make
35-
run: cargo install cargo-make
34+
- name: install just
35+
run: cargo install just
3636
- name: Compile test
37-
run: cargo make build_test
37+
run: just build_test
3838
- name: Build
3939
run: cargo build --verbose
4040
# - name: Run tests
@@ -45,10 +45,10 @@ jobs:
4545
- uses: actions/checkout@v3
4646
- name: install cxxbridge
4747
run: cargo install cxxbridge-cmd
48-
- name: install cargo-make
49-
run: cargo install cargo-make
48+
- name: install just
49+
run: cargo install just
5050
- name: Compile test
51-
run: cargo make build_test
51+
run: just build_test
5252
- name: Build
5353
run: cargo build --verbose
5454
- name: Run tests

Justfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
build_configure:
2+
cmake -S ./test -B ./test/build -DCMAKE_BUILD_TYPE=Debug
3+
4+
build_test: build_configure
5+
cmake --build ./test/build --config Debug

Makefile.toml

Lines changed: 0 additions & 10 deletions
This file was deleted.

build.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,10 @@ fn main() {
152152
println!("cargo:rustc-link-lib=static=reil");
153153

154154
#[cfg(target_os = "windows")]
155-
println!("cargo:rustc-link-lib=dylib=dbghelp");
155+
{
156+
println!("cargo:rustc-link-lib=dylib=dbghelp");
157+
println!("cargo:rustc-link-lib=dylib=advapi32");
158+
}
156159

157160
println!("cargo:rerun-if-changed=src/");
158161
println!("cargo:rerun-if-changed=src/tinyinst.rs");

0 commit comments

Comments
 (0)