Updated README: Notes about iOS

Also cleaned up some styling inconsistencies.

5 files changed, 150 insertions, 0 deletions

diff --git a/ios/cmake-ios-lagrange.sh b/ios/cmake-ios-lagrange.sh
new file mode 100755
index 00000000..598d89a5
--- /dev/null
+++ b/ios/cmake-ios-lagrange.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+IOS_DIR="$HOME/SDK/ios/arm64"
+cmake ../lagrange \
+    -G Xcode \
+    -DCMAKE_TOOLCHAIN_FILE=$HOME/src/libs/ios-cmake/ios.toolchain.cmake \
+    -DPLATFORM=OS64 \
+    -DENABLE_BITCODE=0 \
+    -DDEPLOYMENT_TARGET=9.0 \
+    -DIOS_DIR=$IOS_DIR \
+    -Dthe_Foundation_DIR=$IOS_DIR/lib/cmake/the_Foundation \
+    -DXCODE_DEVELOPMENT_TEAM=XXXXXXXXXX \
+    -DENABLE_BINCAT_SH=YES \
+    -DENABLE_DOWNLOAD_EDIT=NO
diff --git a/ios/cmake-ios-tf.sh b/ios/cmake-ios-tf.sh
new file mode 100755
index 00000000..89d3bd14
--- /dev/null
+++ b/ios/cmake-ios-tf.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+cmake ../the_Foundation \
+    -DCMAKE_TOOLCHAIN_FILE=$HOME/src/libs/ios-cmake/ios.toolchain.cmake \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DPLATFORM=OS64 \
+    -DENABLE_BITCODE=0 \
+    -DTFDN_STATIC_LIBRARY=YES \
+    -DTFDN_ENABLE_TESTS=NO \
+    -DTFDN_ENABLE_WEBREQUEST=NO \
+    -DIOS_DIR=$HOME/SDK/ios/arm64 \
+    -DCMAKE_INSTALL_PREFIX=$HOME/SDK/ios/arm64 
diff --git a/ios/cross-mac-arm64-ios-arm64.ini b/ios/cross-mac-arm64-ios-arm64.ini
new file mode 100644
index 00000000..aa759cf2
--- /dev/null
+++ b/ios/cross-mac-arm64-ios-arm64.ini
@@ -0,0 +1,27 @@
+[constants]
+xcode       = '/Applications/Xcode.app/Contents/Developer'
+platform    = xcode + '/Platforms/iPhoneOS.platform'
+sdk         = platform + '/Developer/SDKs/iPhoneOS.sdk'
+osminver    = '9.0'
+
+common_flags = ['-arch', 'arm64', '-isysroot', sdk, '-miphoneos-version-min=' + osminver]
+
+[properties]
+sizeof_int  = 4
+sizeof_wchar_t = 4
+sizeof_void* = 8
+c_args      = common_flags + ['-fobjc-abi-version=2', '-ffast-math']
+cpp_args    = common_flags + ['-fobjc-abi-version=2', '-ffast-math', '-fvisibility-inlines-hidden']
+c_link_args = common_flags
+
+[binaries]
+c           = xcode + '/usr/bin/gcc'
+cpp         = xcode + '/usr/bin/g++'
+c_ld        = xcode + '/usr/bin/ld'
+strip       = xcode + '/Toolchains/XcodeDefault.xctoolchain/usr/bin/strip'
+
+[host_machine]
+system      = 'darwin'
+cpu_family  = 'aarc64'
+cpu         = 'arm64'
+endian      = 'little'
diff --git a/ios/deps.sh b/ios/deps.sh
new file mode 100755
index 00000000..9970087d
--- /dev/null
+++ b/ios/deps.sh
@@ -0,0 +1,81 @@
+#!/bin/sh
+KIND=iphone$1
+if [ -z "$1" ]; then
+    echo "Usage: ios-deps.sh os|simulator"
+    exit 0
+fi
+if [ "$KIND" = "iphoneos" ]; then
+    PREFIX=$HOME/SDK/ios
+else
+    PREFIX=$HOME/SDK/ios-sim
+fi
+DIR_FRIBIDI=$HOME/src/libs/fribidi
+DIR_HARFBUZZ=$HOME/src/libs/harfbuzz
+DIR_ICONV=$HOME/src/libs/libiconv-1.16
+DIR_UNISTRING=$HOME/src/libs/libunistring-0.9.10
+DIR_PCRE=$HOME/src/libs/pcre-8.44
+
+echo "Prefix: ${PREFIX}"
+read -p "--- Press Enter to begin ---"
+
+ICONF=$HOME/src/libs/ios-autotools/iconfigure
+# Note: There's a small modification to the `iconfigure` script.
+export OSMINVER=9.0
+export SDK=$KIND
+
+function build_arch() {
+    arch=$1
+    
+    cd $DIR_FRIBIDI
+    rm -rf ios-build
+    mkdir ios-build
+    cd ios-build
+    meson .. \
+        --cross-file $HOME/cross-mac-arm64-ios-arm64.ini \
+        -Dbuildtype=release \
+        -Ddefault_library=static \
+        -Dtests=false \
+        -Ddocs=false \
+        -Dbin=false \
+        -Ddocs=false \
+        --prefix ${PREFIX}/arm64
+    ninja install
+
+    cd $DIR_HARFBUZZ
+    make clean
+    PREFIX=$PREFIX/$arch $ICONF $arch --with-cairo=no --with-glib=no --with-freetype=no --with-gobject=no --with-chafa=no --with-graphite2=no --with-coretext=no
+    make install
+    
+    cd $DIR_ICONV
+    make clean
+    PREFIX=$PREFIX/$arch $ICONF $arch
+    make install
+
+    cd $DIR_UNISTRING
+    make clean
+    PREFIX=$PREFIX/$arch $ICONF $arch --disable-namespacing --with-libiconv-prefix=$PREFIX/$arch
+    make install
+
+    cd $DIR_PCRE
+    make clean
+    PREFIX=$PREFIX/$arch $ICONF $arch --enable-unicode-properties
+    make install
+}
+
+function fat_archive() {
+    lipo \
+        -arch x86_64 $PREFIX/x86_64/lib/$1 \
+        -arch arm64 $PREFIX/arm64/lib/$1 \
+        -output $PREFIX/fat/lib/$1 -create
+}
+
+#build_arch x86_64
+build_arch arm64
+
+#fat_archive libiconv.a
+#fat_archive libunistring.a
+#fat_archive libpcre.a
+
+#mkdir -p $PREFIX/fat/include
+#cp -r $PREFIX/arm64/include/* $PREFIX/fat/include
+
diff --git a/ios/iconfigure-osminver.patch b/ios/iconfigure-osminver.patch
new file mode 100644
index 00000000..2ef0076d
--- /dev/null
+++ b/ios/iconfigure-osminver.patch
@@ -0,0 +1,18 @@
+diff --git a/iconfigure b/iconfigure
+index 734bb47..e31c6cf 100755
+--- a/iconfigure
++++ b/iconfigure
+@@ -93,10 +93,10 @@ export CXX=$(xcrun --sdk $SDK --find g++)
+ export LD=$(xcrun --sdk $SDK --find ld)
+ 
+ # Flags
+-export CFLAGS="$CFLAGS -arch $ARCH -isysroot $SDKROOT -I$PREFIX/include -miphoneos-version-min=$SDKVERSION"
+-export CPPFLAGS="$CPPFLAGS -arch $ARCH -isysroot $SDKROOT -I$PREFIX/include -miphoneos-version-min=$SDKVERSION"
++export CFLAGS="$CFLAGS -arch $ARCH -isysroot $SDKROOT -I$PREFIX/include -miphoneos-version-min=$OSMINVER"
++export CPPFLAGS="$CPPFLAGS -arch $ARCH -isysroot $SDKROOT -I$PREFIX/include -miphoneos-version-min=$OSMINVER"
+ export CXXFLAGS="$CXXFLAGS -arch $ARCH -isysroot $SDKROOT -I$PREFIX/include"
+-export LDFLAGS="$LDFLAGS -arch $ARCH -isysroot $SDKROOT -L$PREFIX/lib"
++export LDFLAGS="$LDFLAGS -arch $ARCH -isysroot $SDKROOT -L$PREFIX/lib -miphoneos-version-min=$OSMINVER"
+ export PKG_CONFIG_PATH="$PKG_CONFIG_PATH":"$SDKROOT/usr/lib/pkgconfig":"$PREFIX/lib/pkgconfig"
+ 
+ # Remove script parameters