[dependencies]Adapt build script on SDL2.0 not to merge armv6. Relate…

…s to #131

IndieLib/common/dependencies/SDL-2.0/build-scripts/iosbuild.sh

@@ -250,9 +250,9 @@ if test x$merge = xyes; then
     sh $auxdir/mkinstalldirs build/$output
     cd build
     target=`find . -mindepth 4 -maxdepth 4 -type f -name '*.dylib' | head -1 | sed 's|.*/||'`
-    (lipo -create -o $output/libSDL2.a armv6/build/.libs/libSDL2.a armv7/build/.libs/libSDL2.a i386/build/.libs/libSDL2.a &&
-     lipo -create -o $output/libSDL2main.a armv6/build/libSDL2main.a armv7/build/libSDL2main.a i386/build/libSDL2main.a &&
-     cp -r armv6/include ios
+    (lipo -create -o $output/libSDL2.a armv7/build/.libs/libSDL2.a i386/build/.libs/libSDL2.a &&
+     lipo -create -o $output/libSDL2main.a armv7/build/libSDL2main.a i386/build/libSDL2main.a &&
+     cp -r armv7/include ios
      echo "Build complete!" &&
      echo "Files can be found under the build/ios directory.") || exit 4
     cd ..

IndieLib/ios/builddependencies.sh

@@ -13,9 +13,21 @@ make -f Makefile.iphone
 
 #build static SDL lib only
 cd ../SDL-2.0
-MIN_OS_VERSION=5.0
+export MIN_OS_VERSION=5.0
 ./build-scripts/iosbuild.sh clean
-./build-scripts/iosbuild.sh configure-armv7 configure-i386
-./build-scripts/iosbuild.sh make-armv7 make-i386
+./build-scripts/iosbuild.sh configure-armv7 
+./build-scripts/iosbuild.sh make-armv7 
+./build-scripts/iosbuild.sh configure-i386
+./build-scripts/iosbuild.sh make-i386
+./build-scripts/iosbuild.sh merge
+
+# copy binaries in to a more accessible location
+#mkdir ios
+#mkdir ios/armv7
+#mkdir ios/i386
+#cp ./build/armv7/build/*.a ./ios/armv7
+#cp ./build/armv7/build/*.la ./ios/armv7
+#cp ./build/i386/build/*.a ./ios/i386
+#cp ./build/i386/build/*.la ./ios/i386
 
 cd $RUNDIR