diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-24 15:43:05 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-24 16:40:08 +0200 |
| commit | cd9a89257a0004ca18460befc4b141bc07ed5c22 (patch) | |
| tree | e336a602b561854f043557096b83140aa04cd63a /linux | |
| parent | 10c765948471e6d13e2eb45b44ac6c4d108dafc5 (diff) | |
| download | qtlocation-mapboxgl-cd9a89257a0004ca18460befc4b141bc07ed5c22.tar.gz | |
restructure gyp files
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/main.cpp | 9 | ||||
| -rw-r--r-- | linux/mapboxgl-app.gyp | 21 |
2 files changed, 11 insertions, 19 deletions
diff --git a/linux/main.cpp b/linux/main.cpp index a4f9a6298d..604e471dd1 100644 --- a/linux/main.cpp +++ b/linux/main.cpp @@ -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; diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp index 05716dd11c..09734fc1c4 100644 --- a/linux/mapboxgl-app.gyp +++ b/linux/mapboxgl-app.gyp @@ -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', ], |