4 files changed, 45 insertions, 2 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18789f9c..22fe36f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -285,7 +285,12 @@ else ()
 endif ()
 
 # Target.
-add_executable (app ${SOURCES} ${RESOURCES})
+if (NOT ANDROID)
+    add_executable (app ${SOURCES} ${RESOURCES})
+else ()
+    # The whole app becomes one shared library, based on this static one.
+    add_library (app STATIC ${SOURCES})
+endif ()
 set_property (TARGET app PROPERTY C_STANDARD 11)
 if (TARGET ext-deps)
     add_dependencies (app ext-deps)
diff --git a/Depends-Android.cmake b/Depends-Android.cmake
new file mode 100644
index 00000000..74635620
--- /dev/null
+++ b/Depends-Android.cmake
@@ -0,0 +1,31 @@
+if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/lib/the_Foundation/.git)
+    message (FATAL_ERROR "'lib/the_Foundation' Git submodule not found")
+endif ()
+
+# the_Foundation is checked out as a submodule, make sure it's up to date.
+find_package (Git)
+if (GIT_FOUND)
+    execute_process (
+        COMMAND ${GIT_EXECUTABLE} submodule update
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        OUTPUT_VARIABLE subout
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    if (subout)
+        message (FATAL_ERROR "'lib/the_Foundation' Git submodule has been updated, please re-run CMake.\n")
+    endif ()
+endif ()
+
+set (INSTALL_THE_FOUNDATION OFF)
+set (TFDN_STATIC_LIBRARY    ON  CACHE BOOL "")
+set (TFDN_ENABLE_INSTALL    OFF CACHE BOOL "")
+set (TFDN_ENABLE_TESTS      OFF CACHE BOOL "")
+set (TFDN_ENABLE_WEBREQUEST OFF CACHE BOOL "")
+add_subdirectory (lib/the_Foundation)  
+add_library (the_Foundation::the_Foundation ALIAS the_Foundation)
+if (NOT OPENSSL_FOUND)
+    message (FATAL_ERROR "Lagrange requires OpenSSL for TLS. Please check if pkg-config can find 'openssl'.")
+endif ()
+if (NOT ZLIB_FOUND)
+    message (FATAL_ERROR "Lagrange requires zlib for reading compressed archives. Please check if pkg-config can find 'zlib'.")
+endif ()
\ No newline at end of file
diff --git a/Depends.cmake b/Depends.cmake
index ca01b6c5..246f3398 100644
--- a/Depends.cmake
+++ b/Depends.cmake
@@ -3,6 +3,11 @@ if (IOS)
     return ()
 endif ()
 
+if (ANDROID)
+    include (Depends-Android.cmake)
+    return ()
+endif ()
+
 find_package (PkgConfig)
 find_program (MESON_EXECUTABLE meson DOC "Meson build system")
 find_program (NINJA_EXECUTABLE ninja DOC "Ninja build tool")
diff --git a/src/main.c b/src/main.c
index 6e5e99e9..ad69c6df 100644
--- a/src/main.c
+++ b/src/main.c
@@ -67,9 +67,11 @@ int main(int argc, char **argv) {
                           "ECDHE-RSA-AES128-GCM-SHA256:"
                           "DHE-RSA-AES256-GCM-SHA384");
     SDL_SetHint(SDL_HINT_VIDEO_ALLOW_SCREENSAVER, "1");
+    SDL_SetHint(SDL_HINT_MAC_BACKGROUND_APP, "1");
     SDL_SetHint(SDL_HINT_MAC_CTRL_CLICK_EMULATE_RIGHT_CLICK, "1");
+#if SDL_VERSION_ATLEAST(2, 0, 8)
     SDL_SetHint(SDL_HINT_VIDEO_X11_NET_WM_BYPASS_COMPOSITOR, "0");
-    SDL_SetHint(SDL_HINT_MAC_BACKGROUND_APP, "1");
+#endif
 #if 0
     SDL_SetHint(SDL_HINT_MOUSE_TOUCH_EVENTS, "1"); /* debugging! */
 #endif