Commit 9b3d6ab9 authored by Thomas Guillem's avatar Thomas Guillem

MVK: fix simulator build with -a

parent ea926603
...@@ -134,6 +134,14 @@ get_arch() { ...@@ -134,6 +134,14 @@ get_arch() {
fi fi
} }
is_simulator_arch() {
if [ "$1" = "i386" -o "$1" = "x86_64" ];then
return 0
else
return 1
fi
}
spushd() spushd()
{ {
pushd "$1" 2>&1> /dev/null pushd "$1" 2>&1> /dev/null
...@@ -814,12 +822,15 @@ build_universal_static_lib() { ...@@ -814,12 +822,15 @@ build_universal_static_lib() {
fi fi
done done
spushd $actual_arch/lib/vlc/plugins if (! is_simulator_arch $arch);then
for i in `ls *.a` echo "IPHONE OS: $arch"
do spushd $actual_arch/lib/vlc/plugins
VLCMODULES="$i $VLCMODULES" for i in `ls *.a`
done do
spopd # $actual_arch/lib/vlc/plugins VLCMODULES="$i $VLCMODULES"
done
spopd # $actual_arch/lib/vlc/plugins
fi
if [ "$OSSTYLE" != "AppleTV" -a \ if [ "$OSSTYLE" != "AppleTV" -a \
\( "$FARCH" = "all" -o "$FARCH" = "armv7" -o "$FARCH" = "armv7s" \) ]; then \( "$FARCH" = "all" -o "$FARCH" = "armv7" -o "$FARCH" = "armv7s" \) ]; then
...@@ -836,6 +847,16 @@ build_universal_static_lib() { ...@@ -836,6 +847,16 @@ build_universal_static_lib() {
if [ -d libvlc/vlc/install-"$OSSTYLE"Simulator ];then if [ -d libvlc/vlc/install-"$OSSTYLE"Simulator ];then
spushd libvlc/vlc/install-"$OSSTYLE"Simulator spushd libvlc/vlc/install-"$OSSTYLE"Simulator
if (is_simulator_arch $arch);then
echo "SIMU OS: $arch"
spushd $actual_arch/lib/vlc/plugins
for i in `ls *.a`
do
VLCMODULES="$i $VLCMODULES"
done
spopd # $actual_arch/lib/vlc/plugins
fi
for i in `ls .` for i in `ls .`
do do
local iarch="`get_arch $i`" local iarch="`get_arch $i`"
...@@ -950,11 +971,11 @@ if [ "$TVOS" != "yes" ]; then ...@@ -950,11 +971,11 @@ if [ "$TVOS" != "yes" ]; then
info "Building static MobileVLCKit.framework" info "Building static MobileVLCKit.framework"
lipo_libs="" lipo_libs=""
if [ -d libvlc/vlc/install-iPhoneOS ];then if [ "$FARCH" = "all" ] || (! is_simulator_arch $FARCH);then
buildxcodeproj MobileVLCKit "MobileVLCKit" iphoneos buildxcodeproj MobileVLCKit "MobileVLCKit" iphoneos
lipo_libs="$lipo_libs ${CONFIGURATION}-iphoneos/libMobileVLCKit.a" lipo_libs="$lipo_libs ${CONFIGURATION}-iphoneos/libMobileVLCKit.a"
fi fi
if [ -d libvlc/vlc/install-iPhoneSimulator ];then if [ "$FARCH" = "all" ] || (is_simulator_arch $arch);then
buildxcodeproj MobileVLCKit "MobileVLCKit" iphonesimulator buildxcodeproj MobileVLCKit "MobileVLCKit" iphonesimulator
lipo_libs="$lipo_libs ${CONFIGURATION}-iphonesimulator/libMobileVLCKit.a" lipo_libs="$lipo_libs ${CONFIGURATION}-iphonesimulator/libMobileVLCKit.a"
fi fi
......
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