diff options
Diffstat (limited to 'mapboxgl.gyp')
| -rw-r--r-- | mapboxgl.gyp | 159 |
1 files changed, 81 insertions, 78 deletions
diff --git a/mapboxgl.gyp b/mapboxgl.gyp index dcd89f3a76..68434bf2ba 100644 --- a/mapboxgl.gyp +++ b/mapboxgl.gyp @@ -31,7 +31,7 @@ '<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gl.cpp', '<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gles2.cpp' ], - 'include_dirs':[ + 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/include/', ] } @@ -126,53 +126,70 @@ '<!@(find src -name "*.glsl")', 'bin/style.json' ], - 'xcode_settings': { - 'SDKROOT': 'macosx', - 'SUPPORTED_PLATFORMS':['macosx'], - 'MACOSX_DEPLOYMENT_TARGET':'10.9', - 'PUBLIC_HEADERS_FOLDER_PATH': 'include', - 'OTHER_CPLUSPLUSFLAGS':[ - '<@(png_cflags)', - '<@(uv_cflags)', - '-I<(boost_root)/include', - ] - }, - 'include_dirs':[ - './include' - ], - 'cflags': [ - '<@(png_cflags)', - '-I<(boost_root)/include', + 'include_dirs': [ + './include' ], - 'direct_dependent_settings': { - 'include_dirs':[ - './include', - ], - 'cflags': [ + 'conditions': [ + ['OS == "mac"', { + 'xcode_settings': { + 'SDKROOT': 'macosx', + 'SUPPORTED_PLATFORMS': ['macosx'], + 'MACOSX_DEPLOYMENT_TARGET': '10.9', + 'PUBLIC_HEADERS_FOLDER_PATH': 'include', + 'OTHER_CPLUSPLUSFLAGS': [ '<@(png_cflags)', '<@(uv_cflags)', + '<@(curl_cflags)', + '<@(sqlite3_cflags)', + '-I<(boost_root)/include', + ], + 'OTHER_CFLAGS': [ + '<@(uv_cflags)', + ], + }, + }, { + 'cflags': [ + '<@(png_cflags)', + '<@(uv_cflags)', + '<@(curl_cflags)', + '<@(sqlite3_cflags)', + '-I<(boost_root)/include', ], - 'xcode_settings': { - 'OTHER_CPLUSPLUSFLAGS':[ - '<@(png_cflags)', + }] + ], + 'direct_dependent_settings': { + 'include_dirs': [ + './include', + ], + 'conditions': [ + ['OS == "mac"', { + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS': [ '<@(uv_cflags)', - ] - }, - 'conditions': [ - ['OS == "mac"', { - 'xcode_settings': { - 'OTHER_LDFLAGS': [ - '<@(png_libraries)', - '<@(uv_libraries)', - ] - } - }, { - 'libraries': [ + '<@(curl_cflags)', + '-I<(boost_root)/include', + ], + 'OTHER_LDFLAGS': [ '<@(png_libraries)', '<@(uv_libraries)', + '<@(curl_libraries)', + '<@(sqlite3_libraries)', ] - }] - ] + } + }, { + 'cflags': [ + '<@(uv_cflags)', + '<@(curl_cflags)', + '-I<(boost_root)/include', + ], + 'libraries': [ + '<@(png_libraries)', + '<@(uv_libraries)', + '<@(curl_libraries)', + '<@(sqlite3_libraries)', + ] + }] + ] } }, { @@ -181,7 +198,7 @@ 'type': 'static_library', 'hard_dependency': 1, 'dependencies': [ - 'shaders', + 'shaders', ], 'sources': [ '<!@(find src/ \( -name "*.cpp" ! -name shaders.hpp ! -name shaders_gles2.cpp ! -name shaders_gl.cpp \))', @@ -195,56 +212,42 @@ ], 'xcode_settings': { 'SDKROOT': 'iphoneos', - 'SUPPORTED_PLATFORMS':['iphonesimulator','iphoneos'], + 'SUPPORTED_PLATFORMS': ['iphonesimulator','iphoneos'], 'ARCHS': [ "armv7", "armv7s", "arm64", "i386", "x86_64" ], 'TARGETED_DEVICE_FAMILY': '1,2', 'CODE_SIGN_IDENTITY': 'iPhone Developer', 'IPHONEOS_DEPLOYMENT_TARGET': '7.0', 'PUBLIC_HEADERS_FOLDER_PATH': 'include', - 'GCC_INPUT_FILETYPE':'sourcecode.cpp.cpp', - 'OTHER_CPLUSPLUSFLAGS':[ + 'GCC_INPUT_FILETYPE': 'sourcecode.cpp.cpp', + 'OTHER_CPLUSPLUSFLAGS': [ '<@(png_cflags)', '<@(uv_cflags)', + '<@(curl_cflags)', + '<@(sqlite3_cflags)', '-I<(boost_root)/include', - ] + ], }, - 'include_dirs':[ - './include' - ], - 'cflags': [ - '<@(png_cflags)', - '<@(uv_cflags)', - '-I<(boost_root)/include', + 'include_dirs': [ + './include' ], 'direct_dependent_settings': { - 'include_dirs':[ - './include' + 'include_dirs': [ + './include', + ], + 'xcode_settings': { + 'OTHER_LDFLAGS': [ + '<@(png_libraries)', + '<@(uv_libraries)', + '<@(curl_libraries)', + '<@(sqlite3_libraries)', ], - 'cflags': [ - '<@(png_cflags)', - '<@(uv_cflags)', + 'OTHER_CPLUSPLUSFLAGS': [ + '<@(uv_cflags)', ], - 'xcode_settings': { - 'OTHER_CPLUSPLUSFLAGS':[ - '<@(png_cflags)', - '<@(uv_cflags)', - ] - }, - 'conditions': [ - ['OS == "mac"', { - 'xcode_settings': { - 'OTHER_LDFLAGS': [ - '<@(png_libraries)', - '<@(uv_libraries)', - ] - } - }, { - 'libraries': [ - '<@(png_libraries)', - '<@(uv_libraries)' - ] - }] - ] + 'OTHER_CFLAGS': [ + '<@(uv_cflags)', + ], + } } } ] |