diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | gyp/linux.gyp | 2 | ||||
| -rw-r--r-- | gyp/osx.gyp | 4 | ||||
| -rw-r--r-- | platform/linux/main.cpp (renamed from linux/main.cpp) | 0 | ||||
| -rw-r--r-- | platform/linux/mapboxgl-app.gypi (renamed from linux/mapboxgl-app.gypi) | 10 | ||||
| -rw-r--r-- | platform/osx/Icon.icns (renamed from macosx/Icon.icns) | bin | 64088 -> 64088 bytes | |||
| -rw-r--r-- | platform/osx/Info.plist (renamed from macosx/Info.plist) | 0 | ||||
| -rw-r--r-- | platform/osx/main.mm (renamed from macosx/main.mm) | 0 | ||||
| -rw-r--r-- | platform/osx/mapboxgl-app.gypi (renamed from macosx/mapboxgl-app.gypi) | 14 |
9 files changed, 15 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore index d5fb118e90..e68138b499 100644 --- a/.gitignore +++ b/.gitignore @@ -13,8 +13,6 @@ /config/*.gypi /build /lib -/macosx/build -/linux/build /ios/build /ios/app/build /test/build diff --git a/gyp/linux.gyp b/gyp/linux.gyp index 6cc168ba8d..51d304bc65 100644 --- a/gyp/linux.gyp +++ b/gyp/linux.gyp @@ -1,6 +1,6 @@ { 'includes': [ - '../linux/mapboxgl-app.gypi', + '../platform/linux/mapboxgl-app.gypi', ], 'conditions': [ diff --git a/gyp/osx.gyp b/gyp/osx.gyp index 64663540b2..8810144a80 100644 --- a/gyp/osx.gyp +++ b/gyp/osx.gyp @@ -1,7 +1,7 @@ { 'includes': [ - '../macosx/mapboxgl-app.gypi', - '../linux/mapboxgl-app.gypi', + '../platform/osx/mapboxgl-app.gypi', + '../platform/linux/mapboxgl-app.gypi', '../test/test.gypi', '../bin/render.gypi', ], diff --git a/linux/main.cpp b/platform/linux/main.cpp index bb571a0093..bb571a0093 100644 --- a/linux/main.cpp +++ b/platform/linux/main.cpp diff --git a/linux/mapboxgl-app.gypi b/platform/linux/mapboxgl-app.gypi index 0c9e03ce38..c3e66101a9 100644 --- a/linux/mapboxgl-app.gypi +++ b/platform/linux/mapboxgl-app.gypi @@ -1,6 +1,6 @@ { 'includes': [ - '../gyp/common.gypi', + '../../gyp/common.gypi', ], 'targets': [ { 'target_name': 'linuxapp', @@ -18,10 +18,10 @@ 'sources': [ 'main.cpp', - '../platform/default/settings_json.cpp', - '../platform/default/glfw_view.hpp', - '../platform/default/glfw_view.cpp', - '../platform/default/log_stderr.cpp', + '../default/settings_json.cpp', + '../default/glfw_view.hpp', + '../default/glfw_view.cpp', + '../default/log_stderr.cpp', ], 'variables' : { diff --git a/macosx/Icon.icns b/platform/osx/Icon.icns Binary files differindex 64a5e57cf8..64a5e57cf8 100644 --- a/macosx/Icon.icns +++ b/platform/osx/Icon.icns diff --git a/macosx/Info.plist b/platform/osx/Info.plist index 514db118ea..514db118ea 100644 --- a/macosx/Info.plist +++ b/platform/osx/Info.plist diff --git a/macosx/main.mm b/platform/osx/main.mm index 6b8aef3814..6b8aef3814 100644 --- a/macosx/main.mm +++ b/platform/osx/main.mm diff --git a/macosx/mapboxgl-app.gypi b/platform/osx/mapboxgl-app.gypi index 67e5e211ed..2bb893af30 100644 --- a/macosx/mapboxgl-app.gypi +++ b/platform/osx/mapboxgl-app.gypi @@ -1,6 +1,6 @@ { 'includes': [ - '../gyp/common.gypi', + '../../gyp/common.gypi', ], 'targets': [ { 'target_name': 'osxapp', @@ -22,11 +22,11 @@ 'sources': [ './main.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', + '../darwin/settings_nsuserdefaults.hpp', + '../darwin/settings_nsuserdefaults.mm', + '../darwin/reachability.m', + '../default/glfw_view.hpp', + '../default/glfw_view.cpp', ], 'variables' : { @@ -55,7 +55,7 @@ 'OTHER_CPLUSPLUSFLAGS': [ '<@(cflags_cc)' ], 'OTHER_LDFLAGS': [ '<@(ldflags)' ], 'SDKROOT': 'macosx', - 'INFOPLIST_FILE': '../macosx/Info.plist', + 'INFOPLIST_FILE': '../platform/osx/Info.plist', 'CLANG_ENABLE_OBJC_ARC': 'YES' }, } |