Failing to support ASIO with crossbuild
This commit is contained in:
@@ -241,7 +241,6 @@ bundle_desktop_native() {
|
|||||||
|
|
||||||
bundle_plugins_cross() {
|
bundle_plugins_cross() {
|
||||||
local platform="$1"
|
local platform="$1"
|
||||||
shift
|
|
||||||
local rd
|
local rd
|
||||||
rd=$(release_dir "$platform")
|
rd=$(release_dir "$platform")
|
||||||
local os
|
local os
|
||||||
@@ -250,8 +249,8 @@ bundle_plugins_cross() {
|
|||||||
arch=$(platform_arch "$platform")
|
arch=$(platform_arch "$platform")
|
||||||
|
|
||||||
# Build the cdylib with cross
|
# Build the cdylib with cross
|
||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2046
|
||||||
build_binary "$platform" -p "$PLUGIN_NAME" "$@"
|
build_binary "$platform" -p "$PLUGIN_NAME"
|
||||||
|
|
||||||
# Determine source library file
|
# Determine source library file
|
||||||
local src_lib
|
local src_lib
|
||||||
@@ -441,25 +440,14 @@ for platform in "${selected_platforms[@]}"; do
|
|||||||
echo ""
|
echo ""
|
||||||
echo "=== [$step/$total] $platform ==="
|
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
|
if $build_cagire; then
|
||||||
echo " -> cagire"
|
echo " -> cagire"
|
||||||
# shellcheck disable=SC2086
|
build_binary "$platform"
|
||||||
build_binary "$platform" $asio_flag
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if $build_desktop; then
|
if $build_desktop; then
|
||||||
echo " -> cagire-desktop"
|
echo " -> cagire-desktop"
|
||||||
if [[ -n "$asio_flag" ]]; then
|
build_binary "$platform" --features desktop --bin cagire-desktop
|
||||||
build_binary "$platform" --features desktop,asio --bin cagire-desktop
|
|
||||||
else
|
|
||||||
build_binary "$platform" --features desktop --bin cagire-desktop
|
|
||||||
fi
|
|
||||||
if ! is_cross_target "$platform"; then
|
if ! is_cross_target "$platform"; then
|
||||||
echo " -> bundling cagire-desktop .app"
|
echo " -> bundling cagire-desktop .app"
|
||||||
bundle_desktop_native "$platform"
|
bundle_desktop_native "$platform"
|
||||||
@@ -469,7 +457,7 @@ for platform in "${selected_platforms[@]}"; do
|
|||||||
if $build_plugins; then
|
if $build_plugins; then
|
||||||
echo " -> cagire-plugins"
|
echo " -> cagire-plugins"
|
||||||
if is_cross_target "$platform"; then
|
if is_cross_target "$platform"; then
|
||||||
bundle_plugins_cross "$platform" $asio_flag
|
bundle_plugins_cross "$platform"
|
||||||
else
|
else
|
||||||
bundle_plugins_native "$platform"
|
bundle_plugins_native "$platform"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user