move ios folder to platform/ios

ios/build.sh

@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-
-cd ..
-
-if [ ! -f ios/cmake ]
-then 
-  ln -s ../opencv/ios/cmake ios/cmake
-fi
-
-if [ "$1" != "simulator" ]; then    
-
-    rm -f CMakeCache.txt
-    ios/configure-device_xcode.sh
-    rm -rf ios/armv7s lib/Release bin/Release
-    xcodebuild -sdk iphoneos -configuration Release ARCHS="armv7s" -target ALL_BUILD clean build
-    mkdir -p ios/armv7s 
-    cp -r lib/Release/* ios/armv7s/
-    cp -r bin/Release/* ios/armv7s/
-    cp -r opencv/3rdparty/lib/release/* ios/armv7s/
-    #cp -r opencv/lib/Release/* ios/armv7/
-    cd ios/armv7s
-    libtool -static -o libemgucv_armv7s.a *.a
-    cd ../..
-    
-    rm -f CMakeCache.txt
-    ios/configure-device_xcode.sh
-    rm -rf ios/armv7 lib/Release bin/Release
-    xcodebuild -sdk iphoneos -configuration Release ARCHS="armv7" -target ALL_BUILD clean build
-    mkdir -p ios/armv7 
-    cp -r lib/Release/* ios/armv7/
-    cp -r bin/Release/* ios/armv7/
-    cp -r opencv/3rdparty/lib/release/* ios/armv7/
-    #cp -r opencv/lib/Release/* ios/armv7/
-    cd ios/armv7
-    libtool -static -o libemgucv_armv7.a *.a
-    cd ../..
-
-fi
-
-rm -f CMakeCache.txt
-ios/configure-simulator_xcode.sh
-rm -rf ios/i386 lib/Release bin/Release
-xcodebuild -sdk iphonesimulator -configuration Release -target ALL_BUILD clean build
-mkdir -p ios/i386
-cp -r lib/Release/* ios/i386/
-cp -r bin/Release/* ios/i386/
-cp -r opencv/lib/Release/* ios/i386/
-cp -r opencv/3rdparty/lib/release/* ios/i386/
-cd ios/i386
-libtool -static -o libemgucv_i386.a *.a
-cd ../..
-
-rm -rf ios/universal
-mkdir -p ios/universal
-if [ "$1" == "simulator" ]; then
-    cp ios/i386/libemgucv_i386.a ios/universal/libemgucv.a
-else
-#    lipo -create -output ios/universal/libemgucv.a ios/armv6/libemgucv_armv6.a ios/armv7/libemgucv_armv7.a ios/i386/libemgucv_i386.a
-    lipo -create -output ios/universal/libemgucv.a ios/armv7/libemgucv_armv7.a ios/armv7s/libemgucv_armv7s.a ios/i386/libemgucv_i386.a
-fi
-
-mkdir -p Emgu.CV/PInvoke/MonoTouch
-cp -f ios/universal/libemgucv.a Emgu.CV/PInvoke/MonoTouch
-
-cd ios
-

ios/configure-device_xcode.sh

@@ -1 +0,0 @@
-cmake -GXcode -DCMAKE_TOOLCHAIN_FILE=./ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake -DCMAKE_INSTALL_PREFIX=../OpenCV_iPhoneOS ./ 

ios/configure-simulator_xcode.sh

@@ -1 +0,0 @@
-cmake -GXcode -DCMAKE_TOOLCHAIN_FILE=./ios/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake -DCMAKE_INSTALL_PREFIX=../OpenCV_iPhoneSimulator ./ 

platforms/ios/build.sh

@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+if [ ! -f cmake ]
+then 
+  ln -s ../../opencv/platforms/ios/cmake cmake
+fi
+
+cd ../..
+
+
+if [ "$1" != "simulator" ]; then    
+
+    rm -f CMakeCache.txt
+    platforms/ios/configure-device_xcode.sh
+    rm -rf platforms/ios/armv7s bin/Release opencv/3rdparty/lib/Release 
+    xcodebuild -sdk iphoneos -configuration Release ARCHS="armv7s" -target ALL_BUILD clean build
+    mkdir -p platforms/ios/armv7s 
+    #cp -r lib/Release/* ios/armv7s/
+    cp -r bin/Release/* platforms/ios/armv7s/
+    cp -r opencv/3rdparty/lib/Release/* platforms/ios/armv7s/
+    #cp -r opencv/lib/Release/* ios/armv7/
+    cd platforms/ios/armv7s
+    libtool -static -o libemgucv_armv7s.a *.a
+    cd ../../..
+    
+    rm -f CMakeCache.txt
+    platforms/ios/configure-device_xcode.sh
+    rm -rf platforms/ios/armv7 bin/Release opencv/3rdparty/lib/Release
+    xcodebuild -sdk iphoneos -configuration Release ARCHS="armv7" -target ALL_BUILD clean build
+    mkdir -p ios/armv7 
+    #cp -r lib/Release/* ios/armv7/
+    cp -r bin/Release/* platforms/ios/armv7/
+    cp -r opencv/3rdparty/lib/Release/* platforms/ios/armv7/
+    #cp -r opencv/lib/Release/* ios/armv7/
+    cd ios/armv7
+    libtool -static -o libemgucv_armv7.a *.a
+    cd ../../..
+
+fi
+
+rm -f CMakeCache.txt
+platforms/ios/configure-simulator_xcode.sh
+rm -rf platforms/ios/i386 bin/Release opencv/3rdparty/lib/Release
+xcodebuild -sdk iphonesimulator -configuration Release -target ALL_BUILD clean build
+mkdir -p platforms/ios/i386
+#cp -r lib/Release/* ios/i386/
+cp -r bin/Release/* platforms/ios/i386/
+#cp -r opencv/lib/Release/* ios/i386/
+cp -r opencv/3rdparty/lib/Release/* platforms/ios/i386/
+cd platforms/ios/i386
+libtool -static -o libemgucv_i386.a *.a
+cd ../../..
+
+rm -rf platforms/ios/universal
+mkdir -p platforms/ios/universal
+if [ "$1" == "simulator" ]; then
+    cp platforms/ios/i386/libemgucv_i386.a platforms/ios/universal/libemgucv.a
+else
+#    lipo -create -output ios/universal/libemgucv.a ios/armv6/libemgucv_armv6.a ios/armv7/libemgucv_armv7.a ios/i386/libemgucv_i386.a
+    lipo -create -output platforms/ios/universal/libemgucv.a platforms/ios/armv7/libemgucv_armv7.a platforms/ios/armv7s/libemgucv_armv7s.a platforms/ios/i386/libemgucv_i386.a
+fi
+
+mkdir -p Emgu.CV/PInvoke/MonoTouch
+cp -f platforms/ios/universal/libemgucv.a Emgu.CV/PInvoke/MonoTouch
+
+cd platforms/ios
+

platforms/ios/configure-device_xcode.sh

@@ -0,0 +1 @@
+cmake -GXcode -DCMAKE_TOOLCHAIN_FILE=./platforms/ios/cmake/Toolchains/Toolchain-iPhoneOS_Xcode.cmake -DCMAKE_INSTALL_PREFIX=../OpenCV_iPhoneOS ./ 

platforms/ios/configure-simulator_xcode.sh

@@ -0,0 +1 @@
+cmake -GXcode -DCMAKE_TOOLCHAIN_FILE=./platforms/ios/cmake/Toolchains/Toolchain-iPhoneSimulator_Xcode.cmake -DCMAKE_INSTALL_PREFIX=../OpenCV_iPhoneSimulator ./