From d86a71f79afe0e4dac768f61d6bff690567aca5b Mon Sep 17 00:00:00 2001 From: crupest Date: Sun, 24 May 2020 01:40:02 +0800 Subject: ... --- src/platform/CMakeLists.txt | 12 ++++++------ src/platform/graph/CMakeLists.txt | 18 +++++++++--------- src/platform/native/CMakeLists.txt | 14 +++++++------- src/platform/native/UiApplication.cpp | 15 +++++++++++++++ src/platform/native/ui_application.cpp | 15 --------------- 5 files changed, 37 insertions(+), 37 deletions(-) create mode 100644 src/platform/native/UiApplication.cpp delete mode 100644 src/platform/native/ui_application.cpp (limited to 'src/platform') diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt index 01952106..51253b56 100644 --- a/src/platform/CMakeLists.txt +++ b/src/platform/CMakeLists.txt @@ -1,12 +1,12 @@ set(CRU_PLATFORM_BASE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/platform) add_library(cru_platform_base INTERFACE) target_sources(cru_platform_base INTERFACE - ${CRU_PLATFORM_BASE_INCLUDE_DIR}/check.hpp - ${CRU_PLATFORM_BASE_INCLUDE_DIR}/exception.hpp - ${CRU_PLATFORM_BASE_INCLUDE_DIR}/graph_base.hpp - ${CRU_PLATFORM_BASE_INCLUDE_DIR}/heap_debug.hpp - ${CRU_PLATFORM_BASE_INCLUDE_DIR}/matrix.hpp - ${CRU_PLATFORM_BASE_INCLUDE_DIR}/resource.hpp + ${CRU_PLATFORM_BASE_INCLUDE_DIR}/Check.hpp + ${CRU_PLATFORM_BASE_INCLUDE_DIR}/Exception.hpp + ${CRU_PLATFORM_BASE_INCLUDE_DIR}/GraphBase.hpp + ${CRU_PLATFORM_BASE_INCLUDE_DIR}/HeapDebug.hpp + ${CRU_PLATFORM_BASE_INCLUDE_DIR}/Matrix.hpp + ${CRU_PLATFORM_BASE_INCLUDE_DIR}/Resource.hpp ) target_link_libraries(cru_platform_base INTERFACE cru_base) diff --git a/src/platform/graph/CMakeLists.txt b/src/platform/graph/CMakeLists.txt index dac28370..3bf11e8d 100644 --- a/src/platform/graph/CMakeLists.txt +++ b/src/platform/graph/CMakeLists.txt @@ -1,14 +1,14 @@ set(CRU_PLATFORM_GRAPH_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/platform/graph) add_library(cru_platform_graph INTERFACE) target_sources(cru_platform_graph INTERFACE - ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/base.hpp - ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/brush.hpp - ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/font.hpp - ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/geometry.hpp - ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/factory.hpp - ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/resource.hpp - ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/painter.hpp - ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/text_layout.hpp - ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/util/painter.hpp + ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/Base.hpp + ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/Brush.hpp + ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/Font.hpp + ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/Geometry.hpp + ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/Factory.hpp + ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/Resource.hpp + ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/Painter.hpp + ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/TextLayout.hpp + ${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/util/Painter.hpp ) target_link_libraries(cru_platform_graph INTERFACE cru_platform_base) diff --git a/src/platform/native/CMakeLists.txt b/src/platform/native/CMakeLists.txt index 688f2890..c68a0958 100644 --- a/src/platform/native/CMakeLists.txt +++ b/src/platform/native/CMakeLists.txt @@ -1,13 +1,13 @@ set(CRU_PLATFORM_NATIVE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/platform/native) add_library(cru_platform_native STATIC - ui_application.cpp + UiApplication.cpp ) target_sources(cru_platform_native PUBLIC - ${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/base.hpp - ${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/cursor.hpp - ${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/input_method.hpp - ${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/keyboard.hpp - ${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/window.hpp - ${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/ui_application.hpp + ${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/Base.hpp + ${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/Cursor.hpp + ${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/InputMethod.hpp + ${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/Keyboard.hpp + ${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/Window.hpp + ${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/UiApplication.hpp ) target_link_libraries(cru_platform_native PUBLIC cru_platform_graph) diff --git a/src/platform/native/UiApplication.cpp b/src/platform/native/UiApplication.cpp new file mode 100644 index 00000000..200b10e0 --- /dev/null +++ b/src/platform/native/UiApplication.cpp @@ -0,0 +1,15 @@ +#include "cru/platform/native/UiApplication.hpp" + +namespace cru::platform::native { +IUiApplication* IUiApplication::instance = nullptr; + +IUiApplication::IUiApplication() { + if (instance) { + throw std::runtime_error("An ui application has already been created."); + } + + instance = this; +} + +IUiApplication::~IUiApplication() { instance = nullptr; } +} // namespace cru::platform::native diff --git a/src/platform/native/ui_application.cpp b/src/platform/native/ui_application.cpp deleted file mode 100644 index 212d9104..00000000 --- a/src/platform/native/ui_application.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "cru/platform/native/ui_application.hpp" - -namespace cru::platform::native { -IUiApplication* IUiApplication::instance = nullptr; - -IUiApplication::IUiApplication() { - if (instance) { - throw std::runtime_error("An ui application has already been created."); - } - - instance = this; -} - -IUiApplication::~IUiApplication() { instance = nullptr; } -} // namespace cru::platform::native -- cgit v1.2.3