gyp fixes

5 files changed, 75 insertions, 75 deletions

diff --git a/gyp/mbgl-headless.gypi b/gyp/mbgl-headless.gypi
index 5ffc251d22..644f164866 100644
--- a/gyp/mbgl-headless.gypi
+++ b/gyp/mbgl-headless.gypi
@@ -11,5 +11,5 @@
         '../platform/default/headless_display.cpp',
       ],
     },
-  ]
-}
\ No newline at end of file
+  ],
+}
diff --git a/gyp/mbgl-ios.gypi b/gyp/mbgl-ios.gypi
index dbad60086c..daa0052b12 100644
--- a/gyp/mbgl-ios.gypi
+++ b/gyp/mbgl-ios.gypi
@@ -12,7 +12,6 @@
           'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
           'CLANG_ENABLE_OBJC_ARC': 'YES',
           'CODE_SIGN_IDENTITY': 'iPhone Developer',
-          'PUBLIC_HEADERS_FOLDER_PATH': 'include',
         },
         'configurations': {
           'Release': {
@@ -29,28 +28,27 @@
       'product_name': 'mbgl-ios',
       'type': 'static_library',
       'hard_dependency': 1,
-      'include_dirs': [
-        '../include',
-      ],
       'sources': [
         '../platform/ios/cache_database_library.mm',
         '../platform/darwin/log_nslog.mm',
         '../platform/darwin/string_nsstring.mm',
         '../platform/darwin/http_request_baton_cocoa.mm',
       ],
+      'include_dirs': [
+        '../include',
+      ],
       'xcode_settings': {
-        'OTHER_CPLUSPLUSFLAGS': [
-          '<@(uv_cflags)',
-        ],
+        'OTHER_CPLUSPLUSFLAGS': [ '<@(uv_cflags)' ],
       },
+      'libraries': [
+        '<@(uv_static_libs)',
+      ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../include',
         ],
         'xcode_settings': {
-          'OTHER_LDFLAGS': [
-            '<@(uv_libraries)',
-          ],
+          'OTHER_LDFLAGS': [ '<@(uv_ldflags)' ],
         },
       },
     },
diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi
index 39a1755569..a09f3d963e 100644
--- a/gyp/mbgl-linux.gypi
+++ b/gyp/mbgl-linux.gypi
@@ -4,28 +4,36 @@
       'product_name': 'mbgl-linux',
       'type': 'static_library',
       'hard_dependency': 1,
-      'include_dirs': [
-        '../include'
-      ],
+      'variables': {
+        'cflags_cc': [
+          '<@(uv_cflags)',
+          '<@(curl_cflags)',
+        ],
+        'ldflags': [
+          '<@(uv_ldflags)',
+          '<@(curl_ldflags)',
+        ],
+      },
       'sources': [
         '../platform/default/cache_database_tmp.cpp',
         '../platform/default/log_stderr.cpp',
         '../platform/default/string_stdlib.cpp',
         '../platform/default/http_request_baton_curl.cpp',
       ],
+      'include_dirs': [
+        '../include',
+      ],
+      'libraries': [
+        '<@(uv_static_libs)',
+        '<@(curl_static_libs)',
+      ],
       'conditions': [
         ['OS == "mac"', {
           'xcode_settings': {
-            'OTHER_CPLUSPLUSFLAGS': [
-              '<@(uv_cflags)',
-              '<@(curl_cflags)',
-            ],
+            'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
           }
         }, {
-          'cflags': [
-            '<@(uv_cflags)',
-            '<@(curl_cflags)',
-          ],
+          'ldflags': [ '<@(ldflags)' ],
         }]
       ],
       'direct_dependent_settings': {
@@ -35,20 +43,13 @@
         'conditions': [
           ['OS == "mac"', {
             'xcode_settings': {
-              'OTHER_LDFLAGS': [
-                '<@(uv_libraries)',
-                '<@(curl_libraries)',
-              ]
+              'OTHER_LDFLAGS': [ '<@(ldflags)' ],
             }
           }, {
-            'libraries': [
-              '<@(uv_libraries)',
-              '<@(curl_libraries)',
-              '-lboost_regex',
-            ]
+            'ldflags': [ '<@(ldflags)' ],
           }]
-        ]
-      }
+        ],
+      },
     },
-  ]
+  ],
 }
diff --git a/gyp/mbgl-osx.gypi b/gyp/mbgl-osx.gypi
index ba117e5a59..e0a683f218 100644
--- a/gyp/mbgl-osx.gypi
+++ b/gyp/mbgl-osx.gypi
@@ -4,28 +4,27 @@
       'product_name': 'mbgl-osx',
       'type': 'static_library',
       'hard_dependency': 1,
-      'include_dirs': [
-        '../include',
-      ],
       'sources': [
         '../platform/osx/cache_database_application_support.mm',
         '../platform/darwin/log_nslog.mm',
         '../platform/darwin/string_nsstring.mm',
         '../platform/darwin/http_request_baton_cocoa.mm',
       ],
+      'include_dirs': [
+        '../include',
+      ],
       'xcode_settings': {
-        'OTHER_CPLUSPLUSFLAGS': [
-          '<@(uv_cflags)',
-        ],
+        'OTHER_CPLUSPLUSFLAGS': [ '<@(uv_cflags)' ],
       },
+      'libraries': [
+        '<@(uv_static_libs)',
+      ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../include',
         ],
         'xcode_settings': {
-          'OTHER_LDFLAGS': [
-            '<@(uv_libraries)',
-          ],
+          'OTHER_LDFLAGS': [ '<@(uv_ldflags)' ],
         },
       },
     },
diff --git a/gyp/mbgl.gypi b/gyp/mbgl.gypi
index f268fd6255..d69fcc95b2 100644
--- a/gyp/mbgl.gypi
+++ b/gyp/mbgl.gypi
@@ -7,6 +7,24 @@
       'dependencies': [
           'shaders',
       ],
+      'variables': {
+        'cflags_cc': [
+          '<@(png_cflags)',
+          '<@(uv_cflags)',
+          '<@(sqlite3_cflags)',
+          '<@(zlib_cflags)',
+          '-I<(boost_root)/include',
+        ],
+        'cflags': [
+          '<@(uv_cflags)',
+        ],
+        'ldflags': [
+          '<@(png_ldflags)',
+          '<@(uv_ldflags)',
+          '<@(sqlite3_ldflags)',
+          '<@(zlib_ldflags)',
+        ],
+      },
       'sources': [
         '<!@(find src -name "*.cpp")',
         '<!@(test -f "config/constants_local.cpp" && echo "config/constants_local.cpp" || echo "config/constants.cpp")',
@@ -18,31 +36,25 @@
         'bin/style.json'
       ],
       'include_dirs': [
-        '../include'
+        '../include',
+      ],
+      'libraries': [
+        '<@(png_static_libs)',
+        '<@(uv_static_libs)',
+        '<@(sqlite3_static_libs)',
+        '<@(zlib_static_libs)',
       ],
       'conditions': [
         ['OS == "mac"', {
           'xcode_settings': {
-            'PUBLIC_HEADERS_FOLDER_PATH': 'include',
-            'OTHER_CPLUSPLUSFLAGS': [
-              '<@(png_cflags)',
-              '<@(uv_cflags)',
-              '<@(sqlite3_cflags)',
-              '<@(zlib_cflags)',
-              '-I<(boost_root)/include',
-            ],
-            'OTHER_CFLAGS': [
-              '<@(uv_cflags)',
-            ],
+            'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ],
+            'OTHER_CFLAGS': [ '<@(cflags)' ],
+            # Makefile builds don't respect 'libraries' on OS X.
+            'OTHER_LDFLAGS': [ '>@(_libraries)' ],
           },
         }, {
-          'cflags': [
-            '<@(png_cflags)',
-            '<@(uv_cflags)',
-            '<@(sqlite3_cflags)',
-            '<@(zlib_cflags)',
-            '-I<(boost_root)/include',
-          ],
+          'cflags_cc': [ '<@(cflags_cc)' ],
+          'cflags': [ '<@(cflags)' ],
         }]
       ],
       'direct_dependent_settings': {
@@ -52,20 +64,10 @@
         'conditions': [
           ['OS == "mac"', {
             'xcode_settings': {
-              'OTHER_LDFLAGS': [
-                '<@(png_libraries)',
-                '<@(uv_libraries)',
-                '<@(sqlite3_libraries)',
-                '<@(zlib_libraries)',
-              ]
+              'OTHER_LDFLAGS': [ '<@(ldflags)' ]
             }
           }, {
-            'libraries': [
-              '<@(png_libraries)',
-              '<@(uv_libraries)',
-              '<@(sqlite3_libraries)',
-              '<@(zlib_libraries)',
-            ]
+            'ldflags': [ '<@(ldflags)' ]
           }]
         ]
       }