tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restructure gyp files

Browse Source
This commit is contained in:
Konstantin Käfer
2014-10-24 15:43:05 +02:00
parent 10c7659484
commit cd9a89257a
39 changed files with 392 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@@ -2,6 +2,12 @@ BUILDTYPE ?= Release
PYTHON ?= python
V ?= 1
ifeq ($(shell uname -s), Darwin)
PLATFORM ?= osx
endif
PLATFORM ?= linux
all: mbgl
config.gypi: configure
@@ -12,13 +18,13 @@ config-ios.gypi: configure
# Builds the regular library
mbgl: config.gypi mapboxgl.gyp
deps/run_gyp mapboxgl.gyp -Iconfig.gypi --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
deps/run_gyp mapboxgl.gyp -Iconfig.gypi -Dplatform=$(PLATFORM) --depth=. -Goutput_dir=.. --generator-output=./build/mbgl -f make
$(MAKE) -C build/mbgl BUILDTYPE=$(BUILDTYPE) V=$(V) mapboxgl
##### Test cases ###############################################################
build/test/Makefile: src common config.gypi test/test.gyp
deps/run_gyp test/test.gyp -Iconfig.gypi --depth=. -Goutput_dir=.. --generator-output=./build/test -f make
deps/run_gyp test/test.gyp -Iconfig.gypi -Dplatform=$(PLATFORM) --depth=. -Goutput_dir=.. --generator-output=./build/test -f make
test: build/test/Makefile
$(MAKE) -C build/test BUILDTYPE=$(BUILDTYPE) V=$(V) test
@@ -29,7 +35,7 @@ test_%: build/test/Makefile
# build Mac OS X project for Xcode
xtest: config.gypi clear_xcode_cache
deps/run_gyp test/test.gyp -Iconfig.gypi --depth=. -Goutput_dir=.. --generator-output=./build -f xcode
deps/run_gyp test/test.gyp -Iconfig.gypi -Dplatform=osx --depth=. -Goutput_dir=.. --generator-output=./build -f xcode
open ./build/test/test.xcodeproj
##### Makefile builds ##########################################################
@@ -37,7 +43,7 @@ xtest: config.gypi clear_xcode_cache
# Builds the linux app with make.
linux: config.gypi linux/mapboxgl-app.gyp
deps/run_gyp linux/mapboxgl-app.gyp -Iconfig.gypi --depth=. -Goutput_dir=.. --generator-output=./build/linux -f make
deps/run_gyp linux/mapboxgl-app.gyp -Iconfig.gypi -Dplatform=linux --depth=. -Goutput_dir=.. --generator-output=./build/linux -f make
$(MAKE) -C build/linux BUILDTYPE=$(BUILDTYPE) V=$(V) linuxapp
# Executes the Linux binary
@@ -48,7 +54,7 @@ run-linux: linux
# Builds the OS X app with make.
osx: config.gypi macosx/mapboxgl-app.gyp
deps/run_gyp macosx/mapboxgl-app.gyp -Iconfig.gypi --depth=. -Goutput_dir=.. --generator-output=./build/macosx -f make
deps/run_gyp macosx/mapboxgl-app.gyp -Iconfig.gypi -Dplatform=osx --depth=. -Goutput_dir=.. --generator-output=./build/macosx -f make
$(MAKE) -C build/macosx BUILDTYPE=$(BUILDTYPE) V=$(V) osxapp
# Executes the OS X binary
@@ -70,21 +76,21 @@ clear_xcode_cache:
# build Mac OS X project for Xcode
xproj-cli: config.gypi macosx/mapboxgl-app.gyp clear_xcode_cache
deps/run_gyp macosx/mapboxgl-app.gyp -Iconfig.gypi --depth=. --generator-output=./build -f xcode
deps/run_gyp macosx/mapboxgl-app.gyp -Iconfig.gypi -Dplatform=osx --depth=. --generator-output=./build -f xcode
xproj: xproj-cli
open ./build/macosx/mapboxgl-app.xcodeproj
# build iOS project for Xcode
iproj-cli: config-ios.gypi ios/mapbox-gl-cocoa/app/mapboxgl-app.gyp clear_xcode_cache
deps/run_gyp ios/mapbox-gl-cocoa/app/mapboxgl-app.gyp -Iconfig-ios.gypi --depth=. --generator-output=./build -f xcode
deps/run_gyp ios/mapbox-gl-cocoa/app/mapboxgl-app.gyp -Iconfig-ios.gypi -Dplatform=ios --depth=. --generator-output=./build -f xcode
iproj: iproj-cli
open ./build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj
# build Linux project for Xcode (Runs on Mac OS X too, but without platform-specific code)
lproj: config.gypi linux/mapboxgl-app.gyp clear_xcode_cache
deps/run_gyp linux/mapboxgl-app.gyp -Iconfig.gypi --depth=. --generator-output=./build -f xcode
deps/run_gyp linux/mapboxgl-app.gyp -Iconfig.gypi -Dplatform=linux --depth=. --generator-output=./build -f xcode
open ./build/linux/mapboxgl-app.xcodeproj
@@ -98,5 +104,5 @@ clean: clear_xcode_cache
distclean: clean
-rm -rf ./mason_packages
.PHONY: mbgl test linux build/test/Makefile
.PHONY: mbgl test linux clear_xcode_cache build/test/Makefile
# DO NOT DELETE

2
common.gypi
View File

@@ -34,6 +34,6 @@
'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES'
}
},
}
},
}
}

13
gyp/certificates.gypi Normal file
View File

@@ -0,0 +1,13 @@
{
'targets': [
{
'target_name': 'copy_certificate_bundle',
'type': 'none',
'hard_dependency': 1,
'copies': [{
'files': [ '../common/ca-bundle.crt' ],
'destination': '<(PRODUCT_DIR)'
}],
},
]
}

18
gyp/fixtures.gypi Normal file
View File

@@ -0,0 +1,18 @@
{
'targets': [
{
'target_name': 'copy_fixtures',
'type': 'none',
'hard_dependency': 1,
'dependencies': [
'bundle_styles'
],
'copies': [
{
'files': [ '../styles' ],
'destination': '../test/fixtures/style_parser'
}
]
},
]
}

75
gyp/library.gypi Normal file
View File

@@ -0,0 +1,75 @@
{
'targets': [
{
'target_name': 'mapboxgl',
'product_name': 'mapboxgl',
'type': 'static_library',
'hard_dependency': 1,
'dependencies': [
'shaders',
],
'sources': [
'<!@(find src -name "*.cpp")',
'<!@(test -f "config/constants_local.cpp" && echo "config/constants_local.cpp" || echo "config/constants.cpp")',
'<!@(find src -name "*.c")',
'<!@(find src -name "*.h")',
'<!@(find include -name "*.hpp")',
'<!@(find include -name "*.h")',
'<!@(find src -name "*.glsl")',
'bin/style.json'
],
'include_dirs': [
'../include'
],
'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)',
],
},
}, {
'cflags': [
'<@(png_cflags)',
'<@(uv_cflags)',
'<@(sqlite3_cflags)',
'<@(zlib_cflags)',
'-I<(boost_root)/include',
],
}]
],
'direct_dependent_settings': {
'include_dirs': [
'../include',
],
'conditions': [
['OS == "mac"', {
'xcode_settings': {
'OTHER_LDFLAGS': [
'<@(png_libraries)',
'<@(uv_libraries)',
'<@(sqlite3_libraries)',
'<@(zlib_libraries)',
]
}
}, {
'libraries': [
'<@(png_libraries)',
'<@(uv_libraries)',
'<@(sqlite3_libraries)',
'<@(zlib_libraries)',
]
}]
]
}
}
]
}

21
gyp/npm_install.gypi Normal file
View File

@@ -0,0 +1,21 @@
{
'targets': [
{
'target_name': 'npm_install',
'type': 'none',
'hard_dependency': 1,
'actions': [
{
'action_name': 'npm install',
'inputs': [
'../bin/package.json',
],
'outputs': [
'../bin/node_modules',
],
'action': ['./scripts/npm_install.sh', '<@(npm)']
}
],
},
]
}

51
gyp/platform-ios.gypi Normal file
View File

@@ -0,0 +1,51 @@
{
'target_defaults': {
'target_conditions': [
['_type == "static_library"', {
'xcode_settings': {
'SDKROOT': 'iphoneos',
'SUPPORTED_PLATFORMS': 'iphonesimulator iphoneos',
'CLANG_CXX_LIBRARY': 'libc++',
'CLANG_CXX_LANGUAGE_STANDARD':'c++11',
'IPHONEOS_DEPLOYMENT_TARGET':'7.0',
'TARGETED_DEVICE_FAMILY': '1,2',
'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
'CLANG_ENABLE_OBJC_ARC': 'YES',
'CODE_SIGN_IDENTITY': 'iPhone Developer',
'PUBLIC_HEADERS_FOLDER_PATH': 'include',
}
}],
],
},
'targets': [
{
'target_name': 'mapboxgl-ios',
'product_name': 'mapboxgl-ios',
'type': 'static_library',
'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',
],
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [
'<@(uv_cflags)',
],
},
'direct_dependent_settings': {
'include_dirs': [
'../include',
],
'xcode_settings': {
'OTHER_LDFLAGS': [
'<@(uv_libraries)',
],
},
},
},
],
}

53
gyp/platform-linux.gypi Normal file
View File

@@ -0,0 +1,53 @@
{
'targets': [
{
'target_name': 'mapboxgl-linux',
'product_name': 'mapboxgl-linux',
'type': 'static_library',
'include_dirs': [
'../include'
],
'sources': [
'../platform/default/cache_database_tmp.cpp',
'../platform/default/log_stderr.cpp',
'../platform/default/string_stdlib.cpp',
'../platform/default/http_request_baton_curl.cpp',
],
'conditions': [
['OS == "mac"', {
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [
'<@(uv_cflags)',
'<@(curl_cflags)',
],
}
}, {
'cflags': [
'<@(uv_cflags)',
'<@(curl_cflags)',
],
}]
],
'direct_dependent_settings': {
'include_dirs': [
'../include',
],
'conditions': [
['OS == "mac"', {
'xcode_settings': {
'OTHER_LDFLAGS': [
'<@(uv_libraries)',
'<@(curl_libraries)',
]
}
}, {
'libraries': [
'<@(uv_libraries)',
'<@(curl_libraries)',
]
}]
]
}
},
]
}

33
gyp/platform-osx.gypi Normal file
View File

@@ -0,0 +1,33 @@
{
'targets': [
{
'target_name': 'mapboxgl-osx',
'product_name': 'mapboxgl-osx',
'type': 'static_library',
'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',
],
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [
'<@(uv_cflags)',
],
},
'direct_dependent_settings': {
'include_dirs': [
'../include',
],
'xcode_settings': {
'OTHER_LDFLAGS': [
'<@(uv_libraries)',
],
},
},
},
],
}

36
gyp/shaders.gypi Normal file
View File

@@ -0,0 +1,36 @@
{
'targets': [
{
'target_name': 'shaders',
'type': 'none',
'hard_dependency': 1,
'dependencies': [
'npm_install'
],
'actions': [
{
'action_name': 'Build Shaders',
'inputs': [
'<!@(find src -name "*.glsl")'
],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/include/mbgl/shader/shaders.hpp',
'<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gl.cpp',
'<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gles2.cpp',
],
'action': ['<@(node)', 'bin/build-shaders.js', '<(SHARED_INTERMEDIATE_DIR)'],
}
],
'direct_dependent_settings': {
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/include/mbgl/shader/shaders.hpp',
'<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gl.cpp',
'<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gles2.cpp'
],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/include/',
]
}
},
]
}

36
gyp/styles.gypi Normal file
View File

@@ -0,0 +1,36 @@
{
'targets': [
{
'target_name': 'touch_styles',
'type': 'none',
'hard_dependency': 1,
'actions': [
{
'action_name': 'Touch Stylesheet Directory',
'inputs': ['../styles'],
'outputs': ['<(SHARED_INTERMEDIATE_DIR)/'], # need to specify a distinct directory
'action': ['touch', '../styles'],
}
],
},
{
'target_name': 'bundle_styles',
'type': 'none',
'hard_dependency': 1,
'dependencies': [ 'touch_styles' ], # required for xcode http://openradar.appspot.com/7232149
'direct_dependent_settings': {
'mac_bundle_resources': [ '../styles' ],
}
},
{
'target_name': 'copy_styles',
'type': 'none',
'hard_dependency': 1,
'dependencies': [ 'touch_styles' ], # required for xcode http://openradar.appspot.com/7232149
'copies': [{
'files': [ '../styles' ],
'destination': '<(PRODUCT_DIR)'
}],
},
]
}

0
common/nslog_log.hpp → include/mbgl/platform/darwin/log_nslog.hpp
View File

0
common/Reachability.h → include/mbgl/platform/darwin/reachability.h
View File

0
common/settings_nsuserdefaults.hpp → include/mbgl/platform/darwin/settings_nsuserdefaults.hpp
View File

0
common/glfw_view.hpp → include/mbgl/platform/default/glfw_view.hpp
View File

0
common/headless_view.hpp → include/mbgl/platform/default/headless_view.hpp
View File

0
common/stderr_log.hpp → include/mbgl/platform/default/log_stderr.hpp
View File

0
common/settings_json.hpp → include/mbgl/platform/default/settings_json.hpp
View File

2
ios/mapbox-gl-cocoa

Submodule ios/mapbox-gl-cocoa updated: bc2c5fe697...cfbd1cfad4

9
linux/main.cpp
View File

@@ -1,15 +1,16 @@
#include <mbgl/mbgl.hpp>
#include <mbgl/platform/platform.hpp>
#include <mbgl/util/uv.hpp>
#include <mbgl/platform/platform.hpp>
#include <mbgl/platform/default/settings_json.hpp>
#include <mbgl/platform/default/glfw_view.hpp>
#include <mbgl/platform/default/log_stderr.hpp>
#include <signal.h>
#include <getopt.h>
#include <fstream>
#include <sstream>
#include "../common/settings_json.hpp"
#include "../common/glfw_view.hpp"
#include "../common/stderr_log.hpp"
GLFWView *view = nullptr;

21
linux/mapboxgl-app.gyp
View File

@@ -1,7 +1,6 @@
{
'includes': [
'../common.gypi',
'../config.gypi',
],
'targets': [
{
@@ -10,15 +9,9 @@
'type': 'executable',
'sources': [
'./main.cpp',
'../common/settings_json.cpp',
'../common/settings_json.hpp',
'../common/platform_default.cpp',
'../common/glfw_view.hpp',
'../common/glfw_view.cpp',
'../common/http_request_baton_curl.cpp',
'../common/linux.cpp',
'../common/stderr_log.hpp',
'../common/stderr_log.cpp',
'../platform/default/settings_json.cpp',
'../platform/default/glfw_view.cpp',
'../platform/default/log_stderr.cpp',
],
'conditions': [
@@ -29,11 +22,9 @@
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS':[
'<@(glfw3_cflags)',
'<@(curl_cflags)',
],
'OTHER_LDFLAGS': [
'<@(glfw3_libraries)',
'<@(curl_libraries)',
],
}
},
@@ -42,19 +33,19 @@
{
'cflags': [
'<@(glfw3_cflags)',
'<@(curl_cflags)',
],
'link_settings': {
'libraries': [
'<@(glfw3_libraries)',
'<@(curl_libraries)',
'-lboost_regex'
'-L<(boost_root)/lib',
'-lboost_regex',
],
},
}],
],
'dependencies': [
'../mapboxgl.gyp:mapboxgl',
'../mapboxgl.gyp:mapboxgl-linux',
'../mapboxgl.gyp:copy_styles',
'../mapboxgl.gyp:copy_certificate_bundle',
],

11
macosx/main.mm
View File

@@ -1,12 +1,10 @@
#include "../common/settings_nsuserdefaults.hpp"
#include "../common/glfw_view.hpp"
#include "../common/nslog_log.hpp"
#include "../common/Reachability.h"
#include <mbgl/platform/darwin/settings_nsuserdefaults.hpp>
#include <mbgl/platform/darwin/log_nslog.hpp>
#include <mbgl/platform/darwin/Reachability.h>
#include <mbgl/platform/default/glfw_view.hpp>
#import <Foundation/Foundation.h>
#include <uv.h>
@interface URLHandler : NSObject
@property (nonatomic) mbgl::Map *map;
@@ -71,7 +69,6 @@
@end
int main() {
fprintf(stderr, "main thread: 0x%lx\n", uv_thread_self());
mbgl::Log::Set<mbgl::NSLogBackend>();
GLFWView view;

18
macosx/mapboxgl-app.gyp
View File

@@ -1,7 +1,6 @@
{
'includes': [
'../common.gypi',
'../config.gypi'
],
'targets': [
{
@@ -10,17 +9,11 @@
'type': 'executable',
'sources': [
'./main.mm',
'../common/settings_nsuserdefaults.hpp',
'../common/settings_nsuserdefaults.mm',
'../common/platform_nsstring.mm',
'../common/glfw_view.hpp',
'../common/glfw_view.cpp',
'../common/reachability.h',
'../common/reachability.m',
'../common/http_request_baton_cocoa.mm',
'../common/osx.mm',
'../common/nslog_log.hpp',
'../common/nslog_log.mm',
'../platform/darwin/settings_nsuserdefaults.hpp',
'../platform/darwin/settings_nsuserdefaults.mm',
'../platform/darwin/reachability.m',
'../platform/default/glfw_view.hpp',
'../platform/default/glfw_view.cpp',
],
'product_extension': 'app',
'mac_bundle': 1,
@@ -45,6 +38,7 @@
'dependencies': [
'../mapboxgl.gyp:bundle_styles',
'../mapboxgl.gyp:mapboxgl',
'../mapboxgl.gyp:mapboxgl-osx',
]
}
]

254
mapboxgl.gyp
View File

@@ -1,248 +1,16 @@
{
'includes': [
'./common.gypi',
'./gyp/shaders.gypi',
'./gyp/npm_install.gypi',
'./gyp/styles.gypi',
'./gyp/fixtures.gypi',
'./gyp/certificates.gypi',
'./gyp/library.gypi',
],
'conditions': [
['platform == "osx"', { 'includes': ['./gyp/platform-osx.gypi'] }],
['platform == "ios"', { 'includes': ['./gyp/platform-ios.gypi'] }],
['platform == "linux"', { 'includes': ['./gyp/platform-linux.gypi'] }],
],
'targets': [
{
'target_name': 'shaders',
'type': 'none',
'hard_dependency': 1,
'dependencies': [
'npm_install'
],
'actions': [
{
'action_name': 'Build Shaders',
'inputs': [
'<!@(find src -name "*.glsl")'
],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/include/mbgl/shader/shaders.hpp',
'<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gl.cpp',
'<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gles2.cpp',
],
'action': ['<@(node)', 'bin/build-shaders.js', '<(SHARED_INTERMEDIATE_DIR)'],
}
],
'direct_dependent_settings': {
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/include/mbgl/shader/shaders.hpp',
'<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gl.cpp',
'<(SHARED_INTERMEDIATE_DIR)/src/shader/shaders_gles2.cpp'
],
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/include/',
]
}
},
{
'target_name': 'npm_install',
'type': 'none',
'hard_dependency': 1,
'actions': [
{
'action_name': 'npm install',
'inputs': [
'bin/package.json',
],
'outputs': [
'bin/node_modules',
],
'action': ['./scripts/npm_install.sh', '<@(npm)']
}
],
},
{
'target_name': 'touch_styles',
'type': 'none',
'hard_dependency': 1,
'actions': [
{
'action_name': 'Touch Stylesheet Directory',
'inputs': ['styles'],
'outputs': ['<(SHARED_INTERMEDIATE_DIR)/'], # need to specify a distinct directory
'action': ['touch', 'styles'],
}
],
},
{
'target_name': 'bundle_styles',
'type': 'none',
'hard_dependency': 1,
'dependencies': [ 'touch_styles' ], # required for xcode http://openradar.appspot.com/7232149
'direct_dependent_settings': {
'mac_bundle_resources': [ 'styles' ],
}
},
{
'target_name': 'copy_styles',
'type': 'none',
'hard_dependency': 1,
'dependencies': [ 'touch_styles' ], # required for xcode http://openradar.appspot.com/7232149
'copies': [{
'files': [ 'styles' ],
'destination': '<(PRODUCT_DIR)'
}],
},
{
'target_name': 'copy_fixtures',
'type': 'none',
'hard_dependency': 1,
'dependencies': [
'bundle_styles'
],
'copies': [
{
'files': [ 'styles' ],
'destination': 'test/fixtures/style_parser'
}
]
},
{
'target_name': 'copy_certificate_bundle',
'type': 'none',
'hard_dependency': 1,
'copies': [{
'files': [ 'common/ca-bundle.crt' ],
'destination': '<(PRODUCT_DIR)'
}],
},
{
'target_name': 'mapboxgl',
'product_name': 'mapboxgl',
'type': 'static_library',
'hard_dependency': 1,
'dependencies': [
'shaders',
],
'sources': [
'<!@(find src -name "*.cpp")',
'<!@(test -f "config/constants_local.cpp" && echo "config/constants_local.cpp" || echo "config/constants.cpp")',
'<!@(find src -name "*.c")',
'<!@(find src -name "*.h")',
'<!@(find include -name "*.hpp")',
'<!@(find include -name "*.h")',
'<!@(find src -name "*.glsl")',
'bin/style.json'
],
'include_dirs': [
'./include'
],
'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)',
'<@(sqlite3_cflags)',
'<@(zlib_cflags)',
'-I<(boost_root)/include',
],
'OTHER_CFLAGS': [
'<@(uv_cflags)',
],
},
}, {
'cflags': [
'<@(png_cflags)',
'<@(uv_cflags)',
'<@(sqlite3_cflags)',
'<@(zlib_cflags)',
'-I<(boost_root)/include',
],
}]
],
'direct_dependent_settings': {
'include_dirs': [
'./include',
],
'conditions': [
['OS == "mac"', {
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [
'<@(uv_cflags)',
],
'OTHER_LDFLAGS': [
'<@(png_libraries)',
'<@(uv_libraries)',
'<@(sqlite3_libraries)',
'<@(zlib_libraries)',
]
}
}, {
'cflags': [
'<@(uv_cflags)',
],
'libraries': [
'<@(png_libraries)',
'<@(uv_libraries)',
'<@(sqlite3_libraries)',
'<@(zlib_libraries)',
]
}]
]
}
},
{
'target_name': 'mapboxgl-ios',
'product_name': 'mapboxgl-ios',
'type': 'static_library',
'hard_dependency': 1,
'dependencies': [
'shaders',
],
'sources': [
'<!@(find src/ \( -name "*.cpp" ! -name shaders.hpp ! -name shaders_gles2.cpp ! -name shaders_gl.cpp \))',
'<!@(test -f "config/constants_local.cpp" && echo "config/constants_local.cpp" || echo "config/constants.cpp")',
'<!@(find src -name "*.c")',
'<!@(find src -name "*.h")',
'<!@(find include -name "*.hpp")',
'<!@(find include -name "*.h")',
'<!@(find src -name "*.glsl")',
'bin/style.json'
],
'xcode_settings': {
'SDKROOT': 'iphoneos',
'SUPPORTED_PLATFORMS': 'iphonesimulator iphoneos',
'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': [
'<@(png_cflags)',
'<@(uv_cflags)',
'<@(sqlite3_cflags)',
'<@(zlib_cflags)',
'-I<(boost_root)/include',
],
},
'include_dirs': [
'./include'
],
'direct_dependent_settings': {
'include_dirs': [
'./include',
],
'xcode_settings': {
'OTHER_LDFLAGS': [
'<@(png_libraries)',
'<@(uv_libraries)',
'<@(sqlite3_libraries)',
'<@(zlib_libraries)',
],
'OTHER_CPLUSPLUSFLAGS': [
'<@(uv_cflags)',
],
'OTHER_CFLAGS': [
'<@(uv_cflags)',
],
}
}
}
]
}

0
common/http_request_baton_cocoa.mm → platform/darwin/http_request_baton_cocoa.mm
View File

2
common/nslog_log.mm → platform/darwin/log_nslog.mm
View File

@@ -1,4 +1,4 @@
#include "nslog_log.hpp"
#include "log_nslog.hpp"
#import <Foundation/Foundation.h>

2
common/Reachability.m → platform/darwin/reachability.m
View File

@@ -25,7 +25,7 @@
POSSIBILITY OF SUCH DAMAGE.
*/
#import "Reachability.h"
#import <mbgl/platform/darwin/reachability.h>
NSString *const kReachabilityChangedNotification = @"kReachabilityChangedNotification";

2
common/settings_nsuserdefaults.mm → platform/darwin/settings_nsuserdefaults.mm
View File

@@ -1,6 +1,6 @@
#import <Foundation/Foundation.h>
#include "settings_nsuserdefaults.hpp"
#include <mbgl/platform/darwin/settings_nsuserdefaults.hpp>
using namespace mbgl;

2
common/platform_nsstring.mm → platform/darwin/string_nsstring.mm
View File

@@ -18,4 +18,4 @@ std::string lowercase(const std::string &string) {
}
}
}
}

0
common/linux.cpp → platform/default/cache_database_tmp.cpp
View File

2
common/glfw_view.cpp → platform/default/glfw_view.cpp
View File

@@ -1,4 +1,4 @@
#include "glfw_view.hpp"
#include <mbgl/platform/default/glfw_view.hpp>
#include <mbgl/util/string.hpp>

0
common/headless_view.cpp → platform/default/headless_view.cpp
View File

0
common/http_request_baton_curl.cpp → platform/default/http_request_baton_curl.cpp
View File

2
common/stderr_log.cpp → platform/default/log_stderr.cpp
View File

@@ -1,4 +1,4 @@
#include "stderr_log.hpp"
#include <mbgl/platform/default/log_stderr.hpp>
#include <iostream>
#include <cstdarg>

2
common/settings_json.cpp → platform/default/settings_json.cpp
View File

@@ -1,4 +1,4 @@
#include "settings_json.hpp"
#include <mbgl/platform/default/settings_json.hpp>
#include <rapidjson/prettywriter.h>
#include <rapidjson/filestream.h>
#include <rapidjson/document.h>

0
common/platform_default.cpp → platform/default/string_stdlib.cpp
View File

0
common/ios.mm → platform/ios/cache_database_library.mm
View File

0
common/osx.mm → platform/osx/cache_database_application_support.mm
View File

1
test/test.gyp
View File

@@ -1,7 +1,6 @@
{
'includes': [
'../common.gypi',
'../config.gypi'
],
'targets': [
{