6 files changed, 174 insertions, 8 deletions

diff --git a/README.md b/README.md
index a70d27bf..82ac77d8 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ The required tools are a C11 compiler (e.g., Clang or GCC), CMake and `pkg-confi
 4. Create a build directory.
 5. In your empty build directory, run CMake: ```cmake {path_of_lagrange_sources} -DCMAKE_BUILD_TYPE=Release```
 6. Build it: ```cmake --build .```
-7. Now you can run `lagrange`, `lagrange.exe`, or `Lagrange.app`.
+7. Now you can run *lagrange*, *lagrange.exe*, or *Lagrange.app*.
 
 ### Unicode text rendering
 
@@ -113,18 +113,17 @@ You should use a version of the SDL 2 library that is compiled for native Window
     Libs: ${libdir}/SDL2.dll -mwindows
     Cflags: -I${incdir}
 
-The *-mwindows* option is particularly important as that specifies the target is a GUI application. Also note that you are linking directly against the Windows DLL — do not use any prebuilt .lib files if available, as those as specific to MSVC.
+The `-mwindows` option is particularly important as that specifies the target is a GUI application. Also note that you are linking directly against the Windows DLL — do not use any prebuilt .lib files if available, as those as specific to MSVC.
 
 `pkg-config` will find your .pc file if it is on `PKG_CONFIG_PATH` or you place it in a system-wide pkgconfig directory.
 
-Once you have compiled a working binary under MSYS2, there is still an additional step required to allow running it directly from the Windows shell: the shared libraries from MSYS2 must be found either via `PATH` or by copying them to the same directory where `lagrange.exe` is located.
+Once you have compiled a working binary under MSYS2, there is still an additional step required to allow running it directly from the Windows shell: the shared libraries from MSYS2 must be found either via `PATH` or by copying them to the same directory where _lagrange.exe_ is located.
 
 ### Compiling on Raspberry Pi
 
 On Raspberry Pi 4/400, you can compile and run Lagrange just like on a regular desktop PC. Accelerated OpenGL graphics should work fine under X11.
 
-On Raspberry Pi 3 or earlier, you should use a version of SDL that is compiled to take advantage of the Broadcom VideoCore OpenGL ES hardware. This provides the best performance when running Lagrange in a console. OpenGL under X11 on Raspberry Pi 2/3 is quite 
-slow/experimental. When running under X11, software rendering is the best choice and the SDL from Raspbian etc. is sufficient.
+On Raspberry Pi 3 or earlier, you should use a version of SDL that is compiled to take advantage of the Broadcom VideoCore OpenGL ES hardware. This provides the best performance when running Lagrange in a console. OpenGL under X11 on Raspberry Pi 2/3 is quite slow/experimental. When running under X11, software rendering is the best choice and the SDL from Raspbian etc. is sufficient.
 
 The following build options are recommended on Raspberry Pi 2/3:
 
@@ -135,13 +134,30 @@ The following build options are recommended on Raspberry Pi 2/3:
 [rel]: https://git.skyjake.fi/gemini/lagrange/releases
 [tf]:  https://git.skyjake.fi/skyjake/the_Foundation
 
+### Compiling on iOS
+
+Compiling Lagrange on iOS is moderately difficult.
+
+As a prerequisite, you will need to have an [iOS toolchain configuration for CMake](https://github.com/leetal/ios-cmake). CMake is required for Lagrange itself and for the\_Foundation. You will also need [Autotools helpers for iOS](https://github.com/szanni/ios-autotools.git) because HarfBuzz, libiconv, libunistring, and libpcre use Automake. Meson and Ninja are used for GNU FriBidi. The _iconfigure_ script in the Autotools helpers needs to be [patched](ios/iconfigure-osminver.patch).
+
+After these utilities are available, the scripts in _ios/_ can be used as a basis for the build. Unfortunately there is no ready-made high-level script for performing all these steps, so you'll need to adapt them individually to your needs.
+
+1. Meson cross-compilation is controlled with _ios/cross-mac-arm64-ios-arm64.ini_. Modify it to be compatible with your build system and target device.
+2. _ios/deps.sh_ compiles most of the dependencies using Meson, Ninja, and _iconfigure_. Note that the simulator build has not been set up in these scripts, only the `os` build.
+3. Clone [OpenSSL for iPhone](https://github.com/x2on/OpenSSL-for-iPhone.git) and build it with iOS 9.0 as the minimum version. Deploy the static libraries in *$HOME/SDK/ios/$arch/*, or wherever you've set `IOS_DIR` to be.
+4. Create an empty build directory for the\_Foundation and run _ios/cmake-ios-tf.sh_ from there. You may need to adjust the source directory path in the script depending on where you place your build directory.
+5. Now you can `make install` to build and deploy the_Foundation to `IOS_DIR`.
+6. Finally, you can run CMake like in _ios/cmake-ios-lagrange.sh_ to generate an Xcode project that builds the app.
+
+If FriBidi and HarfBuzz are not used (disabling RTL and complex text rendering), the first step can be skipped and the corresponding build steps in _ios/deps.sh_ can be removed. In this case, Meson and Ninja are not needed at all.
+
 ## User files
 
-On Windows, user files are stored in `%HOMEPATH%/AppData/Roaming/fi.skyjake.Lagrange/`, unless one is using the portable distribution and there is a `userdata` subdirectory present in the executable directory.
+On Windows, user files are stored in *%HOMEPATH%/AppData/Roaming/fi.skyjake.Lagrange/*, unless one is using the portable distribution and there is a *userdata/* subdirectory present in the executable directory.
 
-On macOS, user files are stored in `~/Library/Application Support/fi.skyjake.Lagrange/`.
+On macOS, user files are stored in *~/Library/Application Support/fi.skyjake.Lagrange/*.
 
-On Linux/*BSD/other operating systems, user files stored in `~/.config/lagrange` unless you have customized the XDG directories, in which case the `XDG_CONFIG_HOME` environment variable is used to determine where user files saved.
+On Linux/*BSD/other operating systems, user files stored in _~/.config/lagrange/_ unless you have customized the XDG directories, in which case the `XDG_CONFIG_HOME` environment variable is used to determine where user files saved.
 
 The usage and contents of the user files are described in the Help document. You can delete one or more of the files while Lagrange is not running to reset the corresponding data to the default/empty state.
 
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