diff options
-rw-r--r-- | include/cru/ui/xml/XmlMapper.hpp | 0 | ||||
-rw-r--r-- | include/cru/ui/xml/XmlMapperRegistry.hpp | 0 | ||||
-rw-r--r-- | src/common/CMakeLists.txt | 21 | ||||
-rw-r--r-- | src/osx/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/osx/graphics/quartz/CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/osx/gui/CMakeLists.txt | 17 | ||||
-rw-r--r-- | src/platform/CMakeLists.txt | 10 | ||||
-rw-r--r-- | src/platform/bootstrap/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/platform/graphics/CMakeLists.txt | 13 | ||||
-rw-r--r-- | src/platform/gui/CMakeLists.txt | 10 | ||||
-rw-r--r-- | src/ui/CMakeLists.txt | 61 | ||||
-rw-r--r-- | src/ui/xml/XmlMapper.cpp | 0 | ||||
-rw-r--r-- | src/ui/xml/XmlMapperRegistry.cpp | 0 | ||||
-rw-r--r-- | src/win/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/win/graphics/direct/CMakeLists.txt | 16 | ||||
-rw-r--r-- | src/win/gui/CMakeLists.txt | 15 |
16 files changed, 3 insertions, 190 deletions
diff --git a/include/cru/ui/xml/XmlMapper.hpp b/include/cru/ui/xml/XmlMapper.hpp new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/include/cru/ui/xml/XmlMapper.hpp diff --git a/include/cru/ui/xml/XmlMapperRegistry.hpp b/include/cru/ui/xml/XmlMapperRegistry.hpp new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/include/cru/ui/xml/XmlMapperRegistry.hpp diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index d1e3e35a..92ef3d4c 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -1,4 +1,3 @@ -set(CRU_BASE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/common) add_library(cru_base SHARED Base.cpp Exception.cpp @@ -9,32 +8,14 @@ add_library(cru_base SHARED io/Stream.cpp io/MemoryStream.cpp ) -target_sources(cru_base PUBLIC - ${CRU_BASE_INCLUDE_DIR}/Base.hpp - ${CRU_BASE_INCLUDE_DIR}/Bitmask.hpp - ${CRU_BASE_INCLUDE_DIR}/Event.hpp - ${CRU_BASE_INCLUDE_DIR}/Exception.hpp - ${CRU_BASE_INCLUDE_DIR}/Logger.hpp - ${CRU_BASE_INCLUDE_DIR}/PreConfig.hpp - ${CRU_BASE_INCLUDE_DIR}/PropertyTree.hpp - ${CRU_BASE_INCLUDE_DIR}/Range.hpp - ${CRU_BASE_INCLUDE_DIR}/SelfResolvable.hpp - ${CRU_BASE_INCLUDE_DIR}/String.hpp - ${CRU_BASE_INCLUDE_DIR}/StringUtil.hpp - ${CRU_BASE_INCLUDE_DIR}/io/Stream.hpp - ${CRU_BASE_INCLUDE_DIR}/io/MemoryStream.hpp -) +target_compile_definitions(cru_base PRIVATE CRU_BASE_EXPORT_API) target_include_directories(cru_base PUBLIC ${CRU_INCLUDE_DIR}) target_compile_definitions(cru_base PUBLIC $<$<CONFIG:Debug>:CRU_DEBUG>) -target_compile_definitions(cru_base PRIVATE CRU_BASE_EXPORT_API) if (UNIX) target_sources(cru_base PRIVATE ErrnoException.cpp io/UnixFileStream.cpp - PUBLIC - ${CRU_BASE_INCLUDE_DIR}/ErrnoException.hpp - ${CRU_BASE_INCLUDE_DIR}/io/UnixFileStream.hpp ) endif() diff --git a/src/osx/CMakeLists.txt b/src/osx/CMakeLists.txt index 9be5ccf5..7f6a7538 100644 --- a/src/osx/CMakeLists.txt +++ b/src/osx/CMakeLists.txt @@ -1,17 +1,9 @@ -set(CRU_OSX_BASE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/osx) - add_library(cru_osx_base SHARED Convert.cpp Exception.cpp Resource.cpp ) -target_sources(cru_osx_base PUBLIC - ${CRU_OSX_BASE_INCLUDE_DIR}/Convert.hpp - ${CRU_OSX_BASE_INCLUDE_DIR}/Exception.hpp - ${CRU_OSX_BASE_INCLUDE_DIR}/Resource.hpp -) - find_library(FOUNDATION Foundation REQUIRED) find_library(CORE_FOUNDATION CoreFoundation REQUIRED) diff --git a/src/osx/graphics/quartz/CMakeLists.txt b/src/osx/graphics/quartz/CMakeLists.txt index bd75f30b..f5aae675 100644 --- a/src/osx/graphics/quartz/CMakeLists.txt +++ b/src/osx/graphics/quartz/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CRU_OSX_GRAPHICS_NATIVE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/osx/graphics/quartz) - add_library(cru_osx_graphics_quartz SHARED Brush.cpp Convert.cpp @@ -10,16 +8,6 @@ add_library(cru_osx_graphics_quartz SHARED Resource.cpp TextLayout.cpp ) -target_sources(cru_osx_graphics_quartz PUBLIC - ${CRU_OSX_GRAPHICS_NATIVE_INCLUDE_DIR}/Brush.hpp - ${CRU_OSX_GRAPHICS_NATIVE_INCLUDE_DIR}/Convert.hpp - ${CRU_OSX_GRAPHICS_NATIVE_INCLUDE_DIR}/Factory.hpp - ${CRU_OSX_GRAPHICS_NATIVE_INCLUDE_DIR}/Font.hpp - ${CRU_OSX_GRAPHICS_NATIVE_INCLUDE_DIR}/Geometry.hpp - ${CRU_OSX_GRAPHICS_NATIVE_INCLUDE_DIR}/Painter.hpp - ${CRU_OSX_GRAPHICS_NATIVE_INCLUDE_DIR}/Resource.hpp - ${CRU_OSX_GRAPHICS_NATIVE_INCLUDE_DIR}/TextLayout.hpp -) find_library(CORE_GRAPHICS CoreGraphics REQUIRED) find_library(CORE_TEXT CoreText REQUIRED) diff --git a/src/osx/gui/CMakeLists.txt b/src/osx/gui/CMakeLists.txt index f9bfd9c7..27efbe0e 100644 --- a/src/osx/gui/CMakeLists.txt +++ b/src/osx/gui/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CRU_OSX_GUI_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/osx/gui) - add_library(cru_osx_gui SHARED Clipboard.mm Cursor.mm @@ -8,21 +6,6 @@ add_library(cru_osx_gui SHARED Resource.cpp UiApplication.mm Window.mm - - ClipboardPrivate.h - InputMethodPrivate.h - CursorPrivate.h - WindowPrivate.h -) - -target_sources(cru_osx_gui PUBLIC - ${CRU_OSX_GUI_INCLUDE_DIR}/Clipboard.hpp - ${CRU_OSX_GUI_INCLUDE_DIR}/Cursor.hpp - ${CRU_OSX_GUI_INCLUDE_DIR}/InputMethod.hpp - ${CRU_OSX_GUI_INCLUDE_DIR}/Keyboard.hpp - ${CRU_OSX_GUI_INCLUDE_DIR}/Resource.hpp - ${CRU_OSX_GUI_INCLUDE_DIR}/UiApplication.hpp - ${CRU_OSX_GUI_INCLUDE_DIR}/Window.hpp ) find_library(APPKIT AppKit REQUIRED) diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt index e1ce69a3..03754987 100644 --- a/src/platform/CMakeLists.txt +++ b/src/platform/CMakeLists.txt @@ -1,17 +1,7 @@ -set(CRU_PLATFORM_BASE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/platform) add_library(cru_platform_base SHARED ForDllExport.cpp Color.cpp ) -target_sources(cru_platform_base PUBLIC - ${CRU_PLATFORM_BASE_INCLUDE_DIR}/Base.hpp - ${CRU_PLATFORM_BASE_INCLUDE_DIR}/Check.hpp - ${CRU_PLATFORM_BASE_INCLUDE_DIR}/Color.hpp - ${CRU_PLATFORM_BASE_INCLUDE_DIR}/Exception.hpp - ${CRU_PLATFORM_BASE_INCLUDE_DIR}/GraphicsBase.hpp - ${CRU_PLATFORM_BASE_INCLUDE_DIR}/Matrix.hpp - ${CRU_PLATFORM_BASE_INCLUDE_DIR}/Resource.hpp -) target_link_libraries(cru_platform_base PUBLIC cru_base) target_compile_definitions(cru_platform_base PRIVATE CRU_PLATFORM_EXPORT_API) diff --git a/src/platform/bootstrap/CMakeLists.txt b/src/platform/bootstrap/CMakeLists.txt index c979f586..4c8e0959 100644 --- a/src/platform/bootstrap/CMakeLists.txt +++ b/src/platform/bootstrap/CMakeLists.txt @@ -1,10 +1,6 @@ -set(CRU_PLATFORM_BOOTSTRAP_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/platform/bootstrap) add_library(cru_platform_bootstrap SHARED Bootstrap.cpp ) -target_sources(cru_platform_bootstrap PUBLIC - ${CRU_PLATFORM_BOOTSTRAP_INCLUDE_DIR}/Bootstrap.hpp -) if(WIN32) target_link_libraries(cru_platform_bootstrap PUBLIC cru_win_gui) diff --git a/src/platform/graphics/CMakeLists.txt b/src/platform/graphics/CMakeLists.txt index 692f8e70..c668934d 100644 --- a/src/platform/graphics/CMakeLists.txt +++ b/src/platform/graphics/CMakeLists.txt @@ -1,19 +1,6 @@ -set(CRU_PLATFORM_GRAPHICS_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/platform/graphics) add_library(cru_platform_graphics SHARED ForDllExport.cpp NullPainter.cpp ) -target_sources(cru_platform_graphics PUBLIC - ${CRU_PLATFORM_GRAPHICS_INCLUDE_DIR}/Base.hpp - ${CRU_PLATFORM_GRAPHICS_INCLUDE_DIR}/Brush.hpp - ${CRU_PLATFORM_GRAPHICS_INCLUDE_DIR}/Font.hpp - ${CRU_PLATFORM_GRAPHICS_INCLUDE_DIR}/Geometry.hpp - ${CRU_PLATFORM_GRAPHICS_INCLUDE_DIR}/NullPainter.hpp - ${CRU_PLATFORM_GRAPHICS_INCLUDE_DIR}/Factory.hpp - ${CRU_PLATFORM_GRAPHICS_INCLUDE_DIR}/Resource.hpp - ${CRU_PLATFORM_GRAPHICS_INCLUDE_DIR}/Painter.hpp - ${CRU_PLATFORM_GRAPHICS_INCLUDE_DIR}/TextLayout.hpp - ${CRU_PLATFORM_GRAPHICS_INCLUDE_DIR}/util/Painter.hpp -) target_compile_definitions(cru_platform_graphics PRIVATE CRU_PLATFORM_GRAPHICS_EXPORT_API) target_link_libraries(cru_platform_graphics PUBLIC cru_platform_base) diff --git a/src/platform/gui/CMakeLists.txt b/src/platform/gui/CMakeLists.txt index 297d0080..81be85d9 100644 --- a/src/platform/gui/CMakeLists.txt +++ b/src/platform/gui/CMakeLists.txt @@ -1,16 +1,6 @@ -set(CRU_PLATFORM_GUI_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/platform/gui) add_library(cru_platform_gui SHARED Keyboard.cpp UiApplication.cpp ) -target_sources(cru_platform_gui PUBLIC - ${CRU_PLATFORM_GUI_INCLUDE_DIR}/Base.hpp - ${CRU_PLATFORM_GUI_INCLUDE_DIR}/Clipboard.hpp - ${CRU_PLATFORM_GUI_INCLUDE_DIR}/Cursor.hpp - ${CRU_PLATFORM_GUI_INCLUDE_DIR}/InputMethod.hpp - ${CRU_PLATFORM_GUI_INCLUDE_DIR}/Keyboard.hpp - ${CRU_PLATFORM_GUI_INCLUDE_DIR}/Window.hpp - ${CRU_PLATFORM_GUI_INCLUDE_DIR}/UiApplication.hpp -) target_link_libraries(cru_platform_gui PUBLIC cru_platform_graphics) target_compile_definitions(cru_platform_gui PRIVATE CRU_PLATFORM_GUI_EXPORT_API) diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt index e4707cbc..16b03309 100644 --- a/src/ui/CMakeLists.txt +++ b/src/ui/CMakeLists.txt @@ -1,9 +1,6 @@ set(CRU_UI_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/ui) add_library(cru_ui STATIC - Helper.hpp - host/RoutedEventDispatch.hpp - Helper.cpp ThemeManager.cpp UiManager.cpp @@ -42,61 +39,7 @@ add_library(cru_ui STATIC style/Styler.cpp style/StyleRule.cpp style/StyleRuleSet.cpp -) -target_sources(cru_ui PUBLIC - ${CRU_UI_INCLUDE_DIR}/Base.hpp - ${CRU_UI_INCLUDE_DIR}/DebugFlags.hpp - ${CRU_UI_INCLUDE_DIR}/ThemeManager.hpp - ${CRU_UI_INCLUDE_DIR}/UiManager.hpp - ${CRU_UI_INCLUDE_DIR}/components/Component.hpp - ${CRU_UI_INCLUDE_DIR}/components/Menu.hpp - ${CRU_UI_INCLUDE_DIR}/controls/Base.hpp - ${CRU_UI_INCLUDE_DIR}/controls/Button.hpp - ${CRU_UI_INCLUDE_DIR}/controls/Container.hpp - ${CRU_UI_INCLUDE_DIR}/controls/ContentControl.hpp - ${CRU_UI_INCLUDE_DIR}/controls/Control.hpp - ${CRU_UI_INCLUDE_DIR}/controls/FlexLayout.hpp - ${CRU_UI_INCLUDE_DIR}/controls/IBorderControl.hpp - ${CRU_UI_INCLUDE_DIR}/controls/IClickableControl.hpp - ${CRU_UI_INCLUDE_DIR}/controls/LayoutControl.hpp - ${CRU_UI_INCLUDE_DIR}/controls/NoChildControl.hpp - ${CRU_UI_INCLUDE_DIR}/controls/Popup.hpp - ${CRU_UI_INCLUDE_DIR}/controls/RootControl.hpp - ${CRU_UI_INCLUDE_DIR}/controls/ScrollView.hpp - ${CRU_UI_INCLUDE_DIR}/controls/StackLayout.hpp - ${CRU_UI_INCLUDE_DIR}/controls/TextBlock.hpp - ${CRU_UI_INCLUDE_DIR}/controls/TextBox.hpp - ${CRU_UI_INCLUDE_DIR}/controls/TextHostControlService.hpp - ${CRU_UI_INCLUDE_DIR}/controls/Window.hpp - ${CRU_UI_INCLUDE_DIR}/events/FocusChangeEventArgs.hpp - ${CRU_UI_INCLUDE_DIR}/events/KeyEventArgs.hpp - ${CRU_UI_INCLUDE_DIR}/events/MouseButtonEventArgs.hpp - ${CRU_UI_INCLUDE_DIR}/events/MouseEventArgs.hpp - ${CRU_UI_INCLUDE_DIR}/events/MouseWheelEventArgs.hpp - ${CRU_UI_INCLUDE_DIR}/events/PaintEventArgs.hpp - ${CRU_UI_INCLUDE_DIR}/events/RoutedEvent.hpp - ${CRU_UI_INCLUDE_DIR}/events/UiEventArgs.hpp - ${CRU_UI_INCLUDE_DIR}/events/UiEvents.hpp - ${CRU_UI_INCLUDE_DIR}/helper/ClickDetector.hpp - ${CRU_UI_INCLUDE_DIR}/helper/ShortcutHub.hpp - ${CRU_UI_INCLUDE_DIR}/host/LayoutPaintCycler.hpp - ${CRU_UI_INCLUDE_DIR}/host/WindowHost.hpp - ${CRU_UI_INCLUDE_DIR}/render/Base.hpp - ${CRU_UI_INCLUDE_DIR}/render/BorderRenderObject.hpp - ${CRU_UI_INCLUDE_DIR}/render/CanvasRenderObject.hpp - ${CRU_UI_INCLUDE_DIR}/render/FlexLayoutRenderObject.hpp - ${CRU_UI_INCLUDE_DIR}/render/LayoutHelper.hpp - ${CRU_UI_INCLUDE_DIR}/render/LayoutRenderObject.hpp - ${CRU_UI_INCLUDE_DIR}/render/MeasureRequirement.hpp - ${CRU_UI_INCLUDE_DIR}/render/RenderObject.hpp - ${CRU_UI_INCLUDE_DIR}/render/ScrollBar.hpp - ${CRU_UI_INCLUDE_DIR}/render/ScrollRenderObject.hpp - ${CRU_UI_INCLUDE_DIR}/render/StackLayoutRenderObject.hpp - ${CRU_UI_INCLUDE_DIR}/render/TextRenderObject.hpp - ${CRU_UI_INCLUDE_DIR}/style/ApplyBorderStyleInfo.hpp - ${CRU_UI_INCLUDE_DIR}/style/Condition.hpp - ${CRU_UI_INCLUDE_DIR}/style/Styler.hpp - ${CRU_UI_INCLUDE_DIR}/style/StyleRule.hpp - ${CRU_UI_INCLUDE_DIR}/style/StyleRuleSet.hpp + xml/XmlMapper.cpp + xml/XmlMapperRegistry.cpp ) target_link_libraries(cru_ui PUBLIC cru_platform_gui) diff --git a/src/ui/xml/XmlMapper.cpp b/src/ui/xml/XmlMapper.cpp new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/ui/xml/XmlMapper.cpp diff --git a/src/ui/xml/XmlMapperRegistry.cpp b/src/ui/xml/XmlMapperRegistry.cpp new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/src/ui/xml/XmlMapperRegistry.cpp diff --git a/src/win/CMakeLists.txt b/src/win/CMakeLists.txt index bf8de863..fe2cd635 100644 --- a/src/win/CMakeLists.txt +++ b/src/win/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CRU_WIN_BASE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/win/) - add_library(cru_win_base STATIC DebugLogger.hpp StdOutLogger.hpp @@ -7,10 +5,6 @@ add_library(cru_win_base STATIC Exception.cpp HeapDebug.cpp ) -target_sources(cru_win_base PUBLIC - ${CRU_WIN_BASE_INCLUDE_DIR}/Exception.hpp - ${CRU_WIN_BASE_INCLUDE_DIR}/WinPreConfig.hpp -) target_compile_definitions(cru_win_base PUBLIC UNICODE _UNICODE) # use unicode target_link_libraries(cru_win_base PUBLIC cru_base) diff --git a/src/win/graphics/direct/CMakeLists.txt b/src/win/graphics/direct/CMakeLists.txt index d4c96a65..ecd72b13 100644 --- a/src/win/graphics/direct/CMakeLists.txt +++ b/src/win/graphics/direct/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CRU_WIN_GRAPHICS_DIRECT_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/win/graphics/direct) - add_library(cru_win_graphics_direct STATIC Brush.cpp Font.cpp @@ -11,19 +9,5 @@ add_library(cru_win_graphics_direct STATIC WindowPainter.cpp WindowRenderTarget.cpp ) -target_sources(cru_win_graphics_direct PUBLIC - ${CRU_WIN_GRAPHICS_DIRECT_INCLUDE_DIR}/Brush.hpp - ${CRU_WIN_GRAPHICS_DIRECT_INCLUDE_DIR}/ComResource.hpp - ${CRU_WIN_GRAPHICS_DIRECT_INCLUDE_DIR}/ConvertUtil.hpp - ${CRU_WIN_GRAPHICS_DIRECT_INCLUDE_DIR}/Exception.hpp - ${CRU_WIN_GRAPHICS_DIRECT_INCLUDE_DIR}/Font.hpp - ${CRU_WIN_GRAPHICS_DIRECT_INCLUDE_DIR}/Geometry.hpp - ${CRU_WIN_GRAPHICS_DIRECT_INCLUDE_DIR}/Factory.hpp - ${CRU_WIN_GRAPHICS_DIRECT_INCLUDE_DIR}/Painter.hpp - ${CRU_WIN_GRAPHICS_DIRECT_INCLUDE_DIR}/Resource.hpp - ${CRU_WIN_GRAPHICS_DIRECT_INCLUDE_DIR}/TextLayout.hpp - ${CRU_WIN_GRAPHICS_DIRECT_INCLUDE_DIR}/WindowPainter.hpp - ${CRU_WIN_GRAPHICS_DIRECT_INCLUDE_DIR}/WindowRenderTarget.hpp -) target_link_libraries(cru_win_graphics_direct PUBLIC D3D11 D2d1 DWrite) target_link_libraries(cru_win_graphics_direct PUBLIC cru_win_base cru_platform_graphics) diff --git a/src/win/gui/CMakeLists.txt b/src/win/gui/CMakeLists.txt index 53dfe69b..2c8d1aab 100644 --- a/src/win/gui/CMakeLists.txt +++ b/src/win/gui/CMakeLists.txt @@ -1,5 +1,3 @@ -set(CRU_WIN_GUI_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/win/gui) - add_library(cru_win_gui STATIC TimerManager.hpp WindowManager.hpp @@ -15,18 +13,5 @@ add_library(cru_win_gui STATIC WindowClass.cpp WindowManager.cpp ) -target_sources(cru_win_gui PUBLIC - ${CRU_WIN_GUI_INCLUDE_DIR}/Cursor.hpp - ${CRU_WIN_GUI_INCLUDE_DIR}/Exception.hpp - ${CRU_WIN_GUI_INCLUDE_DIR}/Base.hpp - ${CRU_WIN_GUI_INCLUDE_DIR}/GodWindow.hpp - ${CRU_WIN_GUI_INCLUDE_DIR}/InputMethod.hpp - ${CRU_WIN_GUI_INCLUDE_DIR}/Keyboard.hpp - ${CRU_WIN_GUI_INCLUDE_DIR}/Resource.hpp - ${CRU_WIN_GUI_INCLUDE_DIR}/UiApplication.hpp - ${CRU_WIN_GUI_INCLUDE_DIR}/Window.hpp - ${CRU_WIN_GUI_INCLUDE_DIR}/WindowClass.hpp - ${CRU_WIN_GUI_INCLUDE_DIR}/WindowNativeMessageEventArgs.hpp -) target_link_libraries(cru_win_gui PUBLIC imm32) target_link_libraries(cru_win_gui PUBLIC cru_win_graphics_direct cru_platform_gui) |