File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -36,22 +36,9 @@ cmake_args+=(
3636 -DPROJECT_VERSION=" ${VERSION} "
3737)
3838
39- build_arch () {
40- local ARCH=$1 # 64 or 32
41- local TRIPLET
42- if [[ " $ARCH " == " 64" ]]; then
43- TRIPLET=" x64-linux"
44- else
45- TRIPLET=" x86-linux"
46- fi
47-
4839
4940 local BUILD_DIR=" cmake-out-$ARCH "
5041
51- # --- Ensure dependencies are installed for this arch ---
52- io::log_h2 " Installing vcpkg dependencies for $TRIPLET "
53- io::run ./vcpkg/vcpkg install --triplet " $TRIPLET " --allow-unsupported
54-
5542 # Filter out any -B args from cmake_args to avoid clash
5643 local filtered_cmake_args=()
5744 for arg in " ${cmake_args[@]} " ; do
@@ -65,7 +52,6 @@ build_arch() {
6552 time {
6653 io::run cmake -B " $BUILD_DIR " \
6754 " ${filtered_cmake_args[@]} " " ${vcpkg_args[@]} " \
68- -DVCPKG_TARGET_TRIPLET=" $TRIPLET " \
6955 -DCMAKE_C_FLAGS=" -m$ARCH " \
7056 -DCMAKE_CXX_FLAGS=" -m$ARCH "
7157 }
You can’t perform that action at this time.
0 commit comments