Commit a16514d9 authored by Faustino E. Osuna's avatar Faustino E. Osuna Committed by Jean-Baptiste Kempf

VLCKit: install fat binary when needed

If we are only targeting a single architecture, then install the
architecture specific binary files instead of creating a fat binary
with a single architecture.
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 3562db63
...@@ -54,6 +54,7 @@ target_share="${target}/${share}" # Should we consider using a different ...@@ -54,6 +54,7 @@ target_share="${target}/${share}" # Should we consider using a different
linked_libs="" linked_libs=""
prefix=".libs" prefix=".libs"
suffix="dylib" suffix="dylib"
num_archs=$(echo `echo $ARCHS | wc -w`)
########################## ##########################
# @function vlc_install_object(src_lib, dest_dir, type, lib_install_prefix, destination_name, suffix) # @function vlc_install_object(src_lib, dest_dir, type, lib_install_prefix, destination_name, suffix)
...@@ -178,6 +179,11 @@ vlc_install() { ...@@ -178,6 +179,11 @@ vlc_install() {
rm "$fatdest" rm "$fatdest"
fi fi
if test "$num_archs" = "1"; then
echo "Copying $ARCHS $type $fatdest"
local arch_src="$VLC_BUILD_DIR/$ARCHS/$src_dir/$src"
vlc_install_object "$arch_src" "$dest_dir" "$type" "$5" ""
else
# Create a temporary destination dir to store each ARCH object file # Create a temporary destination dir to store each ARCH object file
local tmp_dest_dir="$VLC_BUILD_DIR/tmp/$type" local tmp_dest_dir="$VLC_BUILD_DIR/tmp/$type"
rm -Rf "${tmp_dest_dir}/*" rm -Rf "${tmp_dest_dir}/*"
...@@ -201,6 +207,7 @@ vlc_install() { ...@@ -201,6 +207,7 @@ vlc_install() {
fi fi
fi fi
fi fi
fi
} }
# @function vlc_install # @function vlc_install
########################## ##########################
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment