From bf61609c3231fedb3130070f78177a7b6081e5b4 Mon Sep 17 00:00:00 2001
From: h1romas4 <h1romas4@gmail.com>
Date: Wed, 24 Jan 2024 15:14:00 +0900
Subject: [PATCH] Improved search path and README for libymfm.a links (#2)

---
 .github/workflows/build.yml | 3 ++-
 README.md                   | 6 ++----
 build.rs                    | 6 ++++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b821b1d..a86900c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -39,7 +39,8 @@ jobs:
         export WASI_SDK_PATH=$(pwd)/wasi-sdk-19.0
         export CARGO_TARGET_WASM32_WASI_LINKER=${WASI_SDK_PATH}/bin/lld
         export CARGO_TARGET_WASM32_WASI_RUSTFLAGS="-L ${WASI_SDK_PATH}/share/wasi-sysroot/lib/wasm32-wasi"
-        (mkdir build && cd build && cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/wasi.cmake .. && make -j4)
+        cmake -DCMAKE_TOOLCHAIN_FILE=./cmake/wasi.cmake -S . -B build
+        cmake --build build --parallel $(nproc)
         cargo +nightly build --release --target wasm32-wasi --features bindgen
         ls -laF target/wasm32-wasi/release/
 
diff --git a/README.md b/README.md
index a8231ff..29de9e3 100644
--- a/README.md
+++ b/README.md
@@ -275,10 +275,8 @@ cd libymfm.wasm
 ### Build C/C++ (ymfm)
 
 ```bash
-mkdir build && cd build
-cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/wasi.cmake  ..
-make -j4
-cd ..
+cmake -DCMAKE_TOOLCHAIN_FILE=./cmake/wasi.cmake -S . -B build
+cmake --build build --parallel $(nproc)
 ls -laF dist/ | grep libymfm
 -rw-rw-r--  1 hiromasa hiromasa 480942  5月 25 13:21 libymfm.a
 ```
diff --git a/build.rs b/build.rs
index 900c7da..f54180d 100644
--- a/build.rs
+++ b/build.rs
@@ -1,4 +1,6 @@
+use std::env;
+
 fn main() {
-    // export LD_LIBRARY_PATH=$(pwd)/dist
-    println!("cargo:rustc-link-search=native=./dist");
+    let dir = env::var("CARGO_MANIFEST_DIR").unwrap();
+    println!("cargo:rustc-link-search=native={}/dist", dir);
 }