diff --git a/scripts/build-all.sh b/scripts/build-all.sh index 4b89e4e..55e8d0e 100755 --- a/scripts/build-all.sh +++ b/scripts/build-all.sh @@ -241,7 +241,6 @@ bundle_desktop_native() { bundle_plugins_cross() { local platform="$1" - shift local rd rd=$(release_dir "$platform") local os @@ -250,8 +249,8 @@ bundle_plugins_cross() { arch=$(platform_arch "$platform") # Build the cdylib with cross - # shellcheck disable=SC2086 - build_binary "$platform" -p "$PLUGIN_NAME" "$@" + # shellcheck disable=SC2046 + build_binary "$platform" -p "$PLUGIN_NAME" # Determine source library file local src_lib @@ -441,25 +440,14 @@ for platform in "${selected_platforms[@]}"; do echo "" echo "=== [$step/$total] $platform ===" - # Enable ASIO for Windows targets - local asio_flag="" - case "$platform" in - *windows*) asio_flag="--features asio" ;; - esac - if $build_cagire; then echo " -> cagire" - # shellcheck disable=SC2086 - build_binary "$platform" $asio_flag + build_binary "$platform" fi if $build_desktop; then echo " -> cagire-desktop" - if [[ -n "$asio_flag" ]]; then - build_binary "$platform" --features desktop,asio --bin cagire-desktop - else - build_binary "$platform" --features desktop --bin cagire-desktop - fi + build_binary "$platform" --features desktop --bin cagire-desktop if ! is_cross_target "$platform"; then echo " -> bundling cagire-desktop .app" bundle_desktop_native "$platform" @@ -469,7 +457,7 @@ for platform in "${selected_platforms[@]}"; do if $build_plugins; then echo " -> cagire-plugins" if is_cross_target "$platform"; then - bundle_plugins_cross "$platform" $asio_flag + bundle_plugins_cross "$platform" else bundle_plugins_native "$platform" fi