From 55dce57896341d0f4e35a344cc64944e4b505c10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Wed, 16 Jul 2014 19:00:49 -0700 Subject: rename a few things from mbgl => mapboxgl --- linux/mapboxgl-app.gyp | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ linux/mbgl-app.gyp | 61 -------------------------------------------------- 2 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 linux/mapboxgl-app.gyp delete mode 100644 linux/mbgl-app.gyp (limited to 'linux') diff --git a/linux/mapboxgl-app.gyp b/linux/mapboxgl-app.gyp new file mode 100644 index 0000000000..1d09b5444b --- /dev/null +++ b/linux/mapboxgl-app.gyp @@ -0,0 +1,61 @@ +{ + 'includes': [ + '../common.gypi', + '../config.gypi', + ], + 'targets': [ + { + 'target_name': 'linuxapp', + 'product_name': 'mapbox-gl', + 'type': 'executable', + 'sources': [ + './main.cpp', + '../common/settings_json.cpp', + '../common/settings_json.hpp', + '../common/glfw_view.hpp', + '../common/glfw_view.cpp', + '../common/curl_request.cpp', + '../common/stderr_log.hpp', + '../common/stderr_log.cpp', + ], + + 'conditions': [ + ['OS == "mac"', + + # Mac OS X + { + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS':[ + '<@(glfw3_cflags)', + '<@(curl_cflags)', + ], + 'OTHER_LDFLAGS': [ + '<@(glfw3_libraries)', + '<@(curl_libraries)', + ], + } + }, + + # Non-Mac OS X + { + 'cflags': [ + '<@(glfw3_cflags)', + '<@(curl_cflags)', + ], + 'link_settings': { + 'libraries': [ + '<@(glfw3_libraries)', + '<@(curl_libraries)', + '-lboost_regex' + ], + }, + }], + ], + 'dependencies': [ + '../mapboxgl.gyp:mapboxgl', + '../mapboxgl.gyp:copy_default_stylesheet', + '../mapboxgl.gyp:copy_certificate_bundle', + ], + }, + ], +} diff --git a/linux/mbgl-app.gyp b/linux/mbgl-app.gyp deleted file mode 100644 index 60d33e5936..0000000000 --- a/linux/mbgl-app.gyp +++ /dev/null @@ -1,61 +0,0 @@ -{ - 'includes': [ - '../common.gypi', - '../config.gypi', - ], - 'targets': [ - { - 'target_name': 'linuxapp', - 'product_name': 'mapbox-gl', - 'type': 'executable', - 'sources': [ - './main.cpp', - '../common/settings_json.cpp', - '../common/settings_json.hpp', - '../common/glfw_view.hpp', - '../common/glfw_view.cpp', - '../common/curl_request.cpp', - '../common/stderr_log.hpp', - '../common/stderr_log.cpp', - ], - - 'conditions': [ - ['OS == "mac"', - - # Mac OS X - { - 'xcode_settings': { - 'OTHER_CPLUSPLUSFLAGS':[ - '<@(glfw3_cflags)', - '<@(curl_cflags)', - ], - 'OTHER_LDFLAGS': [ - '<@(glfw3_libraries)', - '<@(curl_libraries)', - ], - } - }, - - # Non-Mac OS X - { - 'cflags': [ - '<@(glfw3_cflags)', - '<@(curl_cflags)', - ], - 'link_settings': { - 'libraries': [ - '<@(glfw3_libraries)', - '<@(curl_libraries)', - '-lboost_regex' - ], - }, - }], - ], - 'dependencies': [ - '../mbgl.gyp:mbgl-x86', - '../mbgl.gyp:copy_default_stylesheet', - '../mbgl.gyp:copy_certificate_bundle', - ], - }, - ], -} -- cgit v1.2.1