WIP: compileAndBuildVLCKit.sh: random fixes

compileAndBuildVLCKit.sh

@@ -262,7 +262,7 @@ doContribLipo() {
     done
     for i in $SIMULATORARCHS
     do
-        files="build-"$OSSTYLE"simulator-$i/contrib/$i-"$OSSTYLE"simulator/lib/$LIBNAME $files"
+        files="build-"$OSSTYLE"simulator-$i/contrib/$i-"$OSSTYLE"simulator$SDK_VERSION/lib/$LIBNAME $files"
     done
 
     lipo $files -create -output install-$OSSTYLE/contrib/$LIBNAME
@@ -306,7 +306,7 @@ build_universal_static_lib() {
     VLCMODULES=""
     VLCMODULECATEGORYNAMES=""
     VLCNEONMODULES=""
-    SIMULATORARCHS=""
+    SIMULATORARCHS="x86_64"
     CONTRIBLIBS=""
     DEVICEARCHS=""
 
@@ -320,7 +320,7 @@ build_universal_static_lib() {
     actual_arch=`get_actual_arch $arch`
 
     # arm64 got the lowest number of modules, so we iterate here
-    if [ -d ${VLCROOT}/build-"$OSSTYLE"os-arm64 ];then
+    if [ -d ${VLCROOT}/build-"$OSSTYLE"os-arm64/lib ];then
         if [ "$OSSTYLE" = "iphone" ];then
             if [ "$FARCH" = "all" ];then
                 DEVICEARCHS="arm64 armv7 armv7s"
@@ -355,7 +355,7 @@ build_universal_static_lib() {
 
     if [ "$OSSTYLE" != "appletv" ];then
         # if we have an armv7(s) slice, we should search for and include NEON modules
-        if [ -d ${VLCROOT}/build-"$OSSTYLE"os-armv7 ];then
+        if [ -d ${VLCROOT}/build-"$OSSTYLE"os-armv7/lib ];then
             spushd ${VLCROOT}/build-"$OSSTYLE"os-armv7/vlc-"$OSSTYLE"os${SDK_VERSION}-armv7/lib/vlc/plugins/
             for f in `ls -F`
             do
@@ -395,7 +395,7 @@ build_universal_static_lib() {
         done
         spopd
 
-        spushd ${VLCROOT}/build-"$OSSTYLE"simulator-x86_64/contrib/x86_64-"$OSSTYLE"simulator/lib
+        spushd ${VLCROOT}/build-"$OSSTYLE"simulator-x86_64/contrib/x86_64-"$OSSTYLE"simulator"$SDK_VERSION"/lib
         for i in `ls *.a`
         do
             CONTRIBLIBS="$i $CONTRIBLIBS"
@@ -447,11 +447,11 @@ build_universal_static_lib() {
             DEVICEARCHS=""
             for i in armv7 armv7s; do
                 local iarch="`get_arch $i`"
-                if [ "$FARCH" == "all" -o "$FARCH" = "$iarch" ];then
+                if [ "$FARCH" -eq "all" -o "$FARCH" -eq "$iarch" ];then
                     DEVICEARCHS="$DEVICEARCHS $iarch"
                 fi
             done
-            SIMULATORARCHS=""
+            #SIMULATORARCHS=""
             for i in $VLCNEONMODULES
             do
                 doVLCLipo "vlc/plugins/" $i "yes" $OSSTYLE
@@ -523,7 +523,7 @@ do
          s)
              BUILD_DEVICE=no
              BUILD_SIMULATOR=yes
-             BUILD_STATIC_FRAMEWORK=no
+             BUILD_STATIC_FRAMEWORK=yes
              ;;
          f)
              BUILD_DEVICE=yes
@@ -543,9 +543,9 @@ do
              SDK=$OPTARG
              ;;
          a)
-             BUILD_DEVICE=yes
-             BUILD_SIMULATOR=yes
-             BUILD_STATIC_FRAMEWORK=yes
+             #BUILD_DEVICE=yes
+             #BUILD_SIMULATOR=yes
+             #BUILD_STATIC_FRAMEWORK=yes
              FARCH=$OPTARG
              ;;
          b)
@@ -673,7 +673,7 @@ if [ "$BUILD_SIMULATOR" != "no" ]; then
 fi
 
 DEVICEARCHS=""
-SIMULATORARCHS=""
+SIMULATORARCHS="x86_64"
 
 if [ "$TVOS" = "yes" ]; then
     build_universal_static_lib "AppleTV"