gyp fixes

1 files changed, 13 insertions, 7 deletions

diff --git a/configure b/configure
index ef289ac5d2..43a665f29b 100755
--- a/configure
+++ b/configure
@@ -69,7 +69,7 @@ PYTHON=`which python || abort 'Cannot find python'`
 >&2 echo -en "\033[0m";
 
 function quote_flags {
-    ${PYTHON} -c "import sys, re; print re.split('(?<!-framework)\s+', ' '.join(sys.argv[1:]))" "$@"
+    ${PYTHON} -c "import sys, re; print filter(None, re.split('(?<!-framework)\s+', ' '.join(sys.argv[1:])))" "$@"
 }
 
 LN=$'\n'
@@ -96,38 +96,44 @@ fi
 
 if [ ! -z ${LIBCURL_VERSION} ]; then
     mason install libcurl ${LIBCURL_VERSION}
+    CONFIG+="    'curl_static_libs': $(quote_flags $(mason static_libs libcurl ${LIBCURL_VERSION})),"$LN
     CONFIG+="    'curl_cflags': $(quote_flags $(mason cflags libcurl ${LIBCURL_VERSION})),"$LN
-    CONFIG+="    'curl_libraries': $(quote_flags $(mason ldflags libcurl ${LIBCURL_VERSION})),"$LN
+    CONFIG+="    'curl_ldflags': $(quote_flags $(mason ldflags libcurl ${LIBCURL_VERSION})),"$LN
 fi
 
 if [ ! -z ${GLFW_VERSION} ]; then
     mason install glfw ${GLFW_VERSION}
+    CONFIG+="    'glfw3_static_libs': $(quote_flags $(mason static_libs glfw ${GLFW_VERSION})),"$LN
     CONFIG+="    'glfw3_cflags': $(quote_flags $(mason cflags glfw ${GLFW_VERSION})),"$LN
-    CONFIG+="    'glfw3_libraries': $(quote_flags $(mason ldflags glfw ${GLFW_VERSION})),"$LN
+    CONFIG+="    'glfw3_ldflags': $(quote_flags $(mason ldflags glfw ${GLFW_VERSION})),"$LN
 fi
 
 if [ ! -z ${LIBPNG_VERSION} ]; then
     mason install libpng ${LIBPNG_VERSION}
+    CONFIG+="    'png_static_libs': $(quote_flags $(mason static_libs libpng ${LIBPNG_VERSION})),"$LN
     CONFIG+="    'png_cflags': $(quote_flags $(mason cflags libpng ${LIBPNG_VERSION})),"$LN
-    CONFIG+="    'png_libraries': $(quote_flags $(mason ldflags libpng ${LIBPNG_VERSION})),"$LN
+    CONFIG+="    'png_ldflags': $(quote_flags $(mason ldflags libpng ${LIBPNG_VERSION})),"$LN
 fi
 
 if [ ! -z ${SQLITE_VERSION} ]; then
     mason install sqlite ${SQLITE_VERSION}
+    CONFIG+="    'sqlite3_static_libs': $(quote_flags $(mason static_libs sqlite ${SQLITE_VERSION})),"$LN
     CONFIG+="    'sqlite3_cflags': $(quote_flags $(mason cflags sqlite ${SQLITE_VERSION})),"$LN
-    CONFIG+="    'sqlite3_libraries': $(quote_flags $(mason ldflags sqlite ${SQLITE_VERSION})),"$LN
+    CONFIG+="    'sqlite3_ldflags': $(quote_flags $(mason ldflags sqlite ${SQLITE_VERSION})),"$LN
 fi
 
 if [ ! -z ${LIBUV_VERSION} ]; then
     mason install libuv ${LIBUV_VERSION}
+    CONFIG+="    'uv_static_libs': $(quote_flags $(mason static_libs libuv ${LIBUV_VERSION})),"$LN
     CONFIG+="    'uv_cflags': $(quote_flags $(mason cflags libuv ${LIBUV_VERSION})),"$LN
-    CONFIG+="    'uv_libraries': $(quote_flags $(mason ldflags libuv ${LIBUV_VERSION})),"$LN
+    CONFIG+="    'uv_ldflags': $(quote_flags $(mason ldflags libuv ${LIBUV_VERSION})),"$LN
 fi
 
 if [ ! -z ${ZLIB_VERSION} ]; then
     mason install zlib ${ZLIB_VERSION}
+    CONFIG+="    'zlib_static_libs': $(quote_flags $(mason static_libs zlib ${ZLIB_VERSION})),"$LN
     CONFIG+="    'zlib_cflags': $(quote_flags $(mason cflags zlib ${ZLIB_VERSION})),"$LN
-    CONFIG+="    'zlib_libraries': $(quote_flags $(mason ldflags zlib ${ZLIB_VERSION})),"$LN
+    CONFIG+="    'zlib_ldflags': $(quote_flags $(mason ldflags zlib ${ZLIB_VERSION})),"$LN
 fi
 
 CONFIG+="  }