From ea8342ecc42149f12f316e692ba12f4dd935c7fc Mon Sep 17 00:00:00 2001
From: sevenc-nanashi <sevenc7c@sevenc7c.com>
Date: Sat, 1 Jun 2024 18:02:36 +0900
Subject: [PATCH] =?UTF-8?q?Fix:=20Linux=E7=92=B0=E5=A2=83=E3=81=AEdll?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .cargo/config.toml             | 4 ++--
 .github/workflows/build.yml    | 2 +-
 .gitignore                     | 2 ++
 crates/cantari/src/settings.rs | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index f0e10c2..9ab0604 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -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"]
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 16f4692..c961f24 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -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
diff --git a/.gitignore b/.gitignore
index ea8c4bf..4ae2f84 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /target
+
+/archive
diff --git a/crates/cantari/src/settings.rs b/crates/cantari/src/settings.rs
index ac135e3..41a5f1b 100644
--- a/crates/cantari/src/settings.rs
+++ b/crates/cantari/src/settings.rs
@@ -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"