summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmake/core-files.cmake2
-rw-r--r--cmake/glfw.cmake10
-rw-r--r--platform/glfw/glfw_view.cpp (renamed from platform/default/glfw_view.cpp)3
-rw-r--r--platform/glfw/glfw_view.hpp (renamed from include/mbgl/platform/default/glfw_view.hpp)0
-rw-r--r--platform/glfw/main.cpp (renamed from bin/glfw.cpp)6
-rw-r--r--platform/glfw/settings_json.cpp (renamed from platform/default/settings_json.cpp)2
-rw-r--r--platform/glfw/settings_json.hpp (renamed from include/mbgl/platform/default/settings_json.hpp)0
7 files changed, 11 insertions, 12 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake
index ee7f786596..c4a28524b1 100644
--- a/cmake/core-files.cmake
+++ b/cmake/core-files.cmake
@@ -138,11 +138,9 @@ set(MBGL_CORE_FILES
src/mbgl/platform/log.cpp
# platform/default
- include/mbgl/platform/default/glfw_view.hpp
include/mbgl/platform/default/headless_backend.hpp
include/mbgl/platform/default/headless_display.hpp
include/mbgl/platform/default/offscreen_view.hpp
- include/mbgl/platform/default/settings_json.hpp
include/mbgl/platform/default/thread_pool.hpp
# programs
diff --git a/cmake/glfw.cmake b/cmake/glfw.cmake
index 5d810d319e..d63bdbc1cf 100644
--- a/cmake/glfw.cmake
+++ b/cmake/glfw.cmake
@@ -1,12 +1,12 @@
add_executable(mbgl-glfw
- bin/glfw.cpp
+ platform/glfw/main.cpp
)
target_sources(mbgl-glfw
- PRIVATE include/mbgl/platform/default/glfw_view.hpp
- PRIVATE platform/default/glfw_view.cpp
- PRIVATE include/mbgl/platform/default/settings_json.hpp
- PRIVATE platform/default/settings_json.cpp
+ PRIVATE platform/glfw/glfw_view.hpp
+ PRIVATE platform/glfw/glfw_view.cpp
+ PRIVATE platform/glfw/settings_json.hpp
+ PRIVATE platform/glfw/settings_json.cpp
PRIVATE platform/default/mbgl/util/default_styles.hpp
PRIVATE platform/default/mbgl/util/default_styles.cpp
)
diff --git a/platform/default/glfw_view.cpp b/platform/glfw/glfw_view.cpp
index 07959b2002..ecc5e73da1 100644
--- a/platform/default/glfw_view.cpp
+++ b/platform/glfw/glfw_view.cpp
@@ -1,4 +1,5 @@
-#include <mbgl/platform/default/glfw_view.hpp>
+#include "glfw_view.hpp"
+
#include <mbgl/annotation/annotation.hpp>
#include <mbgl/sprite/sprite_image.hpp>
#include <mbgl/style/transition_options.hpp>
diff --git a/include/mbgl/platform/default/glfw_view.hpp b/platform/glfw/glfw_view.hpp
index c640f188f9..c640f188f9 100644
--- a/include/mbgl/platform/default/glfw_view.hpp
+++ b/platform/glfw/glfw_view.hpp
diff --git a/bin/glfw.cpp b/platform/glfw/main.cpp
index b51846b4e8..6e4b324c43 100644
--- a/bin/glfw.cpp
+++ b/platform/glfw/main.cpp
@@ -1,9 +1,9 @@
-#include <mbgl/mbgl.hpp>
+#include "glfw_view.hpp"
+#include "settings_json.hpp"
+
#include <mbgl/util/default_styles.hpp>
#include <mbgl/platform/log.hpp>
#include <mbgl/platform/platform.hpp>
-#include <mbgl/platform/default/settings_json.hpp>
-#include <mbgl/platform/default/glfw_view.hpp>
#include <mbgl/platform/default/thread_pool.hpp>
#include <mbgl/storage/default_file_source.hpp>
diff --git a/platform/default/settings_json.cpp b/platform/glfw/settings_json.cpp
index ef53aa83e7..2ba1038dc7 100644
--- a/platform/default/settings_json.cpp
+++ b/platform/glfw/settings_json.cpp
@@ -1,4 +1,4 @@
-#include <mbgl/platform/default/settings_json.hpp>
+#include "settings_json.hpp"
#include <fstream>
namespace mbgl {
diff --git a/include/mbgl/platform/default/settings_json.hpp b/platform/glfw/settings_json.hpp
index eb23b28bc8..eb23b28bc8 100644
--- a/include/mbgl/platform/default/settings_json.hpp
+++ b/platform/glfw/settings_json.hpp