ios build system fixes

[skip ci]

1 files changed, 56 insertions, 19 deletions

diff --git a/configure b/configure
index d8a5e08ed8..d02972d0a4 100755
--- a/configure
+++ b/configure
@@ -12,11 +12,21 @@ LIBPNG_VERSION=1.6.13
 SQLITE_VERSION=system
 LIBUV_VERSION=0.10.28
 
-mason install libcurl ${LIBCURL_VERSION}
-mason install glfw ${GLFW_VERSION}
-mason install libpng ${LIBPNG_VERSION}
-mason install sqlite ${SQLITE_VERSION}
-mason install libuv ${LIBUV_VERSION}
+case $MASON_PLATFORM in
+    'ios')
+        SQLITE_VERSION=system
+        LIBPNG_VERSION=1.6.13
+        LIBUV_VERSION=0.10.28
+        ;;
+    *)
+        GLFW_VERSION=a21f2377
+        SQLITE_VERSION=system
+        LIBPNG_VERSION=system
+        LIBCURL_VERSION=system
+        LIBUV_VERSION=0.10.28
+        ;;
+esac
+
 
 BOOST_ROOT=/usr
 if [ -d '/usr/local/boost' ]; then BOOST_ROOT='/usr/local' ; fi
@@ -25,7 +35,9 @@ function quote_flags {
     python -c "import sys, re; print re.split('(?<!-framework)\s+', ' '.join(sys.argv[1:]))" "$@"
 }
 
-echo "# Do not edit. Generated by the configure script.
+LN=$'\n'
+
+CONFIG="# Do not edit. Generated by the configure script.
 {
   'target_defaults': {
     'cflags': [],
@@ -38,18 +50,43 @@ echo "# Do not edit. Generated by the configure script.
     'node': '$(which node)',
     'npm': '$(which npm)',
     'python': '$(which python)',
-    'boost_root': '/usr/local',
-    'curl_cflags': $(quote_flags $(mason cflags libcurl ${LIBCURL_VERSION})),
-    'curl_libraries': $(quote_flags $(mason ldflags libcurl ${LIBCURL_VERSION})),
-    'glfw3_cflags': $(quote_flags $(mason cflags glfw ${GLFW_VERSION})),
-    'glfw3_libraries': $(quote_flags $(mason ldflags glfw ${GLFW_VERSION})),
-    'png_cflags': $(quote_flags $(mason cflags libpng ${LIBPNG_VERSION})),
-    'png_libraries': $(quote_flags $(mason ldflags libpng ${LIBPNG_VERSION})),
-    'sqlite3_cflags': $(quote_flags $(mason cflags sqlite ${SQLITE_VERSION})),
-    'sqlite3_libraries': $(quote_flags $(mason ldflags sqlite ${SQLITE_VERSION})),
-    'uv_cflags': $(quote_flags $(mason cflags libuv ${LIBUV_VERSION})),
-    'uv_libraries': $(quote_flags $(mason ldflags libuv ${LIBUV_VERSION})),
-  }
-}" > config.gypi
+    'boost_root': '${BOOST_ROOT}',
+"
+
+if [ ! -z ${LIBCURL_VERSION} ]; then
+    mason install libcurl ${LIBCURL_VERSION}
+    CONFIG+=$"    'curl_cflags': $(quote_flags $(mason cflags libcurl ${LIBCURL_VERSION})),"$LN
+    CONFIG+=$"    'curl_libraries': $(quote_flags $(mason ldflags libcurl ${LIBCURL_VERSION})),"$LN
+fi
+
+if [ ! -z ${GLFW_VERSION} ]; then
+    mason install glfw ${GLFW_VERSION}
+    CONFIG+=$"    'glfw3_cflags': $(quote_flags $(mason cflags glfw ${GLFW_VERSION})),"$LN
+    CONFIG+=$"    'glfw3_libraries': $(quote_flags $(mason ldflags glfw ${GLFW_VERSION})),"$LN
+fi
+
+if [ ! -z ${LIBPNG_VERSION} ]; then
+    mason install libpng ${LIBPNG_VERSION}
+    CONFIG+=$"    'png_cflags': $(quote_flags $(mason cflags libpng ${LIBPNG_VERSION})),"$LN
+    CONFIG+=$"    'png_libraries': $(quote_flags $(mason ldflags libpng ${LIBPNG_VERSION})),"$LN
+fi
+
+if [ ! -z ${SQLITE_VERSION} ]; then
+    mason install sqlite ${SQLITE_VERSION}
+    CONFIG+=$"    'sqlite3_cflags': $(quote_flags $(mason cflags sqlite ${SQLITE_VERSION})),"$LN
+    CONFIG+=$"    'sqlite3_libraries': $(quote_flags $(mason ldflags sqlite ${SQLITE_VERSION})),"$LN
+fi
+
+if [ ! -z ${LIBUV_VERSION} ]; then
+    mason install libuv ${LIBUV_VERSION}
+    CONFIG+=$"    'uv_cflags': $(quote_flags $(mason cflags libuv ${LIBUV_VERSION})),"$LN
+    CONFIG+=$"    'uv_libraries': $(quote_flags $(mason ldflags libuv ${LIBUV_VERSION})),"$LN
+fi
+
+CONFIG+="  }
+}
+"
+
+echo "${CONFIG}" > config.gypi
 
 cat config.gypi