From 4c3cdb38b5b32a8bb5bf8154bdb352e0012afcaf Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Mon, 9 Oct 2023 12:29:02 +0900 Subject: [PATCH] infra: migrate cross files into one folder. --- .github/workflows/build_ios.yml | 4 ++-- ios_arm64_cross.txt => cross/ios_aarch64.txt | 0 ios_x86_64_cross.txt => cross/ios_x86_64.txt | 0 wasm_cross.txt => cross/wasm_x86_i686.txt | 0 wasm_build.sh | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) rename ios_arm64_cross.txt => cross/ios_aarch64.txt (100%) rename ios_x86_64_cross.txt => cross/ios_x86_64.txt (100%) rename wasm_cross.txt => cross/wasm_x86_i686.txt (100%) diff --git a/.github/workflows/build_ios.yml b/.github/workflows/build_ios.yml index e5d9ea4d..3b1fd243 100644 --- a/.github/workflows/build_ios.yml +++ b/.github/workflows/build_ios.yml @@ -27,7 +27,7 @@ jobs: - name: Build run: | - meson setup --backend=ninja build -Dlog=true -Dloaders="all" -Dstatic=true -Dsavers="all" -Dbindings="capi" --cross-file ./ios_x86_64_cross.txt + meson setup --backend=ninja build -Dlog=true -Dloaders="all" -Dstatic=true -Dsavers="all" -Dbindings="capi" --cross-file ./cross/ios_x86_64.txt ninja -C build install - uses: actions/upload-artifact@v3 @@ -53,7 +53,7 @@ jobs: - name: Build run: | - meson setup --backend=ninja build -Dlog=true -Dloaders="all" -Dstatic=true -Dsavers="all" -Dbindings="capi" --cross-file ./ios_arm64_cross.txt + meson setup --backend=ninja build -Dlog=true -Dloaders="all" -Dstatic=true -Dsavers="all" -Dbindings="capi" --cross-file ./cross/ios_aarch64.txt ninja -C build install - uses: actions/upload-artifact@v3 diff --git a/ios_arm64_cross.txt b/cross/ios_aarch64.txt similarity index 100% rename from ios_arm64_cross.txt rename to cross/ios_aarch64.txt diff --git a/ios_x86_64_cross.txt b/cross/ios_x86_64.txt similarity index 100% rename from ios_x86_64_cross.txt rename to cross/ios_x86_64.txt diff --git a/wasm_cross.txt b/cross/wasm_x86_i686.txt similarity index 100% rename from wasm_cross.txt rename to cross/wasm_x86_i686.txt diff --git a/wasm_build.sh b/wasm_build.sh index 4616710e..1bc36dab 100755 --- a/wasm_build.sh +++ b/wasm_build.sh @@ -3,7 +3,7 @@ #https://github.com/thorvg/thorvg/wiki/ThorVG-Viewer-Development-Guide if [ ! -d "./build_wasm" ]; then - sed "s|EMSDK:|$1|g" wasm_cross.txt > /tmp/.wasm_cross.txt + sed "s|EMSDK:|$1|g" ./cross/wasm_x86_i686.txt > /tmp/.wasm_cross.txt meson -Db_lto=true -Ddefault_library=static -Dstatic=true -Dloaders="all" -Dsavers="all" -Dbindings="wasm_beta" --cross-file /tmp/.wasm_cross.txt build_wasm fi