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 /macosx | |
| parent | 10c765948471e6d13e2eb45b44ac6c4d108dafc5 (diff) | |
| download | qtlocation-mapboxgl-cd9a89257a0004ca18460befc4b141bc07ed5c22.tar.gz | |
restructure gyp files
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/main.mm | 11 | ||||
| -rw-r--r-- | macosx/mapboxgl-app.gyp | 18 |
2 files changed, 10 insertions, 19 deletions
diff --git a/macosx/main.mm b/macosx/main.mm index 8cf3cc81c3..81494821cf 100644 --- a/macosx/main.mm +++ b/macosx/main.mm @@ -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; diff --git a/macosx/mapboxgl-app.gyp b/macosx/mapboxgl-app.gyp index 51f591fdd0..4451a207b4 100644 --- a/macosx/mapboxgl-app.gyp +++ b/macosx/mapboxgl-app.gyp @@ -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', ] } ] |