Skip to content

Commit

Permalink
Fix: Linux環境のdllを修正
Browse files Browse the repository at this point in the history
  • Loading branch information
sevenc-nanashi committed Jun 1, 2024
1 parent 2e89cf0 commit ea8342e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[target.x86_64-unknown-linux-gnu]
rustflags = [ "-Clink-args=-Wl,-rpath,\\$ORIGIN" ]
rustflags = ["-Clink-args=-Wl,-rpath,\\$ORIGIN"]

[target.x86_64-apple-darwin]
rustflags = [ "-Clink-args=-Wl,-rpath,@loader_path" ]
rustflags = ["-Clink-args=-Wl,-rpath,@loader_path"]
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
run: |
mkdir archive
cp -r target/release/{sample.vvm,*.html,dict} archive
cp target/release/{*.dylib,*.so,*.dll} archive || true
cp target/release/{*.dylib,*.so,*.so.*,*.dll} archive || true
cp target/release/{cantari,cantari.exe} archive || true
cp crates/cantari/engine_manifest.json archive
cd archive
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/target

/archive
2 changes: 1 addition & 1 deletion crates/cantari/src/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
use tracing::error;

fn get_path() -> PathBuf {
let name = if cfg!(feature = "release") {
let name = if cfg!(not(debug_assertions)) {
"cantari.json"
} else {
"cantari-dev.json"
Expand Down

0 comments on commit ea8342e

Please sign in to comment.