Osx remove Resource.h.

25 files changed, 23 insertions, 53 deletions

diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
index 106a03ef..be45d0e0 100644
--- a/src/base/CMakeLists.txt
+++ b/src/base/CMakeLists.txt
@@ -33,7 +33,7 @@ if (UNIX AND NOT EMSCRIPTEN)
 endif()
 
 if (APPLE)
-	target_sources(CruBase PRIVATE Osx.cpp)
+	target_sources(CruBase PRIVATE platform/osx/Base.cpp)
 	find_library(CORE_FOUNDATION CoreFoundation REQUIRED)
 	target_link_libraries(CruBase PUBLIC ${CORE_FOUNDATION})
 endif()
diff --git a/src/base/Osx.cpp b/src/base/platform/osx/Base.cpp
index d979f542..1206d514 100644
--- a/src/base/Osx.cpp
+++ b/src/base/platform/osx/Base.cpp
@@ -1,4 +1,4 @@
-#include "cru/base/Osx.h"
+#include "cru/base/platform/osx/Base.h"
 #include "cru/base/StringUtil.h"
 
 namespace cru {
diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt
index d577d79c..62ebe9c7 100644
--- a/src/platform/CMakeLists.txt
+++ b/src/platform/CMakeLists.txt
@@ -14,7 +14,6 @@ if (WIN32)
 	add_subdirectory(graphics/direct2d)
 	add_subdirectory(gui/win)
 elseif (APPLE)
-	add_subdirectory(osx)
 	add_subdirectory(graphics/quartz)
 	# TODO: Re-enable this!
 	# add_subdirectory(graphics/cairo)
diff --git a/src/platform/graphics/quartz/Convert.cpp b/src/platform/graphics/quartz/Base.cpp
index 06699b0c..3d6e664a 100644
--- a/src/platform/graphics/quartz/Convert.cpp
+++ b/src/platform/graphics/quartz/Base.cpp
@@ -1,4 +1,4 @@
-#include "cru/platform/graphics/quartz/Convert.h"
+#include "cru/platform/graphics/quartz/Base.h"
 
 namespace cru::platform::graphics::quartz {
 
diff --git a/src/platform/graphics/quartz/Brush.cpp b/src/platform/graphics/quartz/Brush.cpp
index c5784e51..acdc7170 100644
--- a/src/platform/graphics/quartz/Brush.cpp
+++ b/src/platform/graphics/quartz/Brush.cpp
@@ -1,4 +1,5 @@
 #include "cru/platform/graphics/quartz/Brush.h"
+
 #include <format>
 
 namespace cru::platform::graphics::quartz {
diff --git a/src/platform/graphics/quartz/CMakeLists.txt b/src/platform/graphics/quartz/CMakeLists.txt
index 88050a07..bde8e815 100644
--- a/src/platform/graphics/quartz/CMakeLists.txt
+++ b/src/platform/graphics/quartz/CMakeLists.txt
@@ -1,19 +1,20 @@
 add_library(CruPlatformGraphicsQuartz
+	Base.cpp
 	Brush.cpp
-	Convert.cpp
 	Factory.cpp
 	Font.cpp
 	Geometry.cpp
 	Image.cpp
 	ImageFactory.cpp
 	Painter.cpp
-	Resource.cpp
 	TextLayout.cpp
 )
 
+find_library(FOUNDATION Foundation REQUIRED)
+find_library(CORE_FOUNDATION CoreFoundation REQUIRED)
 find_library(CORE_GRAPHICS CoreGraphics REQUIRED)
 find_library(CORE_TEXT CoreText REQUIRED)
 find_library(IMAGE_IO ImageIO REQUIRED)
 
-target_link_libraries(CruPlatformGraphicsQuartz PUBLIC ${CORE_GRAPHICS} ${CORE_TEXT} ${IMAGE_IO})
-target_link_libraries(CruPlatformGraphicsQuartz PUBLIC CruPlatformBaseOsx CruPlatformGraphics)
+target_link_libraries(CruPlatformGraphicsQuartz PUBLIC ${FOUNDATION} ${CORE_FOUNDATION} ${CORE_GRAPHICS} ${CORE_TEXT} ${IMAGE_IO})
+target_link_libraries(CruPlatformGraphicsQuartz PUBLIC CruPlatformGraphics)
diff --git a/src/platform/graphics/quartz/Factory.cpp b/src/platform/graphics/quartz/Factory.cpp
index 3a489212..bdef7554 100644
--- a/src/platform/graphics/quartz/Factory.cpp
+++ b/src/platform/graphics/quartz/Factory.cpp
@@ -1,6 +1,5 @@
 #include "cru/platform/graphics/quartz/Factory.h"
 
-#include "cru/platform/graphics/ImageFactory.h"
 #include "cru/platform/graphics/quartz/Brush.h"
 #include "cru/platform/graphics/quartz/Font.h"
 #include "cru/platform/graphics/quartz/Geometry.h"
diff --git a/src/platform/graphics/quartz/Font.cpp b/src/platform/graphics/quartz/Font.cpp
index 12a8aa7f..dc60d559 100644
--- a/src/platform/graphics/quartz/Font.cpp
+++ b/src/platform/graphics/quartz/Font.cpp
@@ -1,7 +1,6 @@
 #include "cru/platform/graphics/quartz/Font.h"
 
-#include "cru/base/Osx.h"
-#include "cru/platform/graphics/quartz/Resource.h"
+#include "cru/base/platform/osx/Base.h"
 
 namespace cru::platform::graphics::quartz {
 OsxCTFont::OsxCTFont(IGraphicsFactory* graphics_factory,
diff --git a/src/platform/graphics/quartz/Geometry.cpp b/src/platform/graphics/quartz/Geometry.cpp
index e6558fbb..4c2f90a6 100644
--- a/src/platform/graphics/quartz/Geometry.cpp
+++ b/src/platform/graphics/quartz/Geometry.cpp
@@ -1,5 +1,4 @@
 #include "cru/platform/graphics/quartz/Geometry.h"
-#include "cru/platform/graphics/quartz/Convert.h"
 
 #include <memory>
 
diff --git a/src/platform/graphics/quartz/Image.cpp b/src/platform/graphics/quartz/Image.cpp
index a6c7c65b..be63f5f5 100644
--- a/src/platform/graphics/quartz/Image.cpp
+++ b/src/platform/graphics/quartz/Image.cpp
@@ -1,6 +1,4 @@
 #include "cru/platform/graphics/quartz/Image.h"
-#include "cru/base/Exception.h"
-#include "cru/platform/graphics/quartz/Convert.h"
 #include "cru/platform/graphics/quartz/Painter.h"
 
 namespace cru::platform::graphics::quartz {
diff --git a/src/platform/graphics/quartz/ImageFactory.cpp b/src/platform/graphics/quartz/ImageFactory.cpp
index 87b2ff36..c591d9d7 100644
--- a/src/platform/graphics/quartz/ImageFactory.cpp
+++ b/src/platform/graphics/quartz/ImageFactory.cpp
@@ -1,8 +1,5 @@
 #include "cru/platform/graphics/quartz/ImageFactory.h"
-#include "cru/base/Exception.h"
-#include "cru/base/Osx.h"
-#include "cru/platform/graphics/Image.h"
-#include "cru/platform/graphics/quartz/Convert.h"
+#include "cru/base/platform/osx/Base.h"
 #include "cru/platform/graphics/quartz/Image.h"
 
 #include <ImageIO/ImageIO.h>
diff --git a/src/platform/graphics/quartz/Painter.cpp b/src/platform/graphics/quartz/Painter.cpp
index b825f28c..90450bab 100644
--- a/src/platform/graphics/quartz/Painter.cpp
+++ b/src/platform/graphics/quartz/Painter.cpp
@@ -1,11 +1,9 @@
 #include "cru/platform/graphics/quartz/Painter.h"
 
 #include "cru/platform/graphics/quartz/Brush.h"
-#include "cru/platform/graphics/quartz/Convert.h"
 #include "cru/platform/graphics/quartz/Geometry.h"
 #include "cru/platform/graphics/quartz/Image.h"
 #include "cru/platform/graphics/quartz/TextLayout.h"
-#include "cru/platform/Color.h"
 
 namespace cru::platform::graphics::quartz {
 QuartzCGContextPainter::QuartzCGContextPainter(
diff --git a/src/platform/graphics/quartz/Resource.cpp b/src/platform/graphics/quartz/Resource.cpp
deleted file mode 100644
index a5d43747..00000000
--- a/src/platform/graphics/quartz/Resource.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "cru/platform/graphics/quartz/Resource.h"
diff --git a/src/platform/graphics/quartz/TextLayout.cpp b/src/platform/graphics/quartz/TextLayout.cpp
index b7a015c1..f98cff3a 100644
--- a/src/platform/graphics/quartz/TextLayout.cpp
+++ b/src/platform/graphics/quartz/TextLayout.cpp
@@ -1,10 +1,7 @@
 #include "cru/platform/graphics/quartz/TextLayout.h"
 #include "cru/base/Base.h"
-#include "cru/base/Osx.h"
 #include "cru/base/StringUtil.h"
-#include "cru/platform/graphics/Base.h"
-#include "cru/platform/graphics/quartz/Convert.h"
-#include "cru/platform/graphics/quartz/Resource.h"
+#include "cru/base/platform/osx/Base.h"
 
 #include <format>
 #include <limits>
diff --git a/src/platform/gui/osx/Resource.cpp b/src/platform/gui/osx/Base.cpp
index d33133c7..0cd7eab1 100644
--- a/src/platform/gui/osx/Resource.cpp
+++ b/src/platform/gui/osx/Base.cpp
@@ -1,4 +1,4 @@
-#include "cru/platform/gui/osx/Resource.h"
+#include "cru/platform/gui/osx/Base.h"
 
 namespace cru::platform::gui::osx {
 OsxGuiResource::OsxGuiResource(IUiApplication* ui_application)
diff --git a/src/platform/gui/osx/CMakeLists.txt b/src/platform/gui/osx/CMakeLists.txt
index 87245cdb..df790392 100644
--- a/src/platform/gui/osx/CMakeLists.txt
+++ b/src/platform/gui/osx/CMakeLists.txt
@@ -1,15 +1,17 @@
 add_library(CruPlatformGuiOsx
+	Base.cpp
 	Clipboard.mm
 	Cursor.mm
 	InputMethod.mm
 	Keyboard.mm
 	Menu.mm
-	Resource.cpp
 	UiApplication.mm
 	Window.mm
 )
 
+find_library(FOUNDATION Foundation REQUIRED)
+find_library(CORE_FOUNDATION CoreFoundation REQUIRED)
 find_library(APPKIT AppKit REQUIRED)
 find_library(UNIFORMTYPEIDENTIFIERS UniformTypeIdentifiers REQUIRED)
 
-target_link_libraries(CruPlatformGuiOsx PUBLIC CruPlatformGui CruPlatformGraphicsQuartz ${APPKIT} ${UNIFORMTYPEIDENTIFIERS})
+target_link_libraries(CruPlatformGuiOsx PUBLIC CruPlatformGui CruPlatformGraphicsQuartz ${FOUNDATION} ${CORE_FOUNDATION} ${APPKIT} ${UNIFORMTYPEIDENTIFIERS})
diff --git a/src/platform/gui/osx/Clipboard.mm b/src/platform/gui/osx/Clipboard.mm
index a09bca1c..61652589 100644
--- a/src/platform/gui/osx/Clipboard.mm
+++ b/src/platform/gui/osx/Clipboard.mm
@@ -1,5 +1,5 @@
 #include "cru/platform/gui/osx/Clipboard.h"
-#include "cru/base/Osx.h"
+#include "cru/base/platform/osx/Base.h"
 #include "cru/base/log/Logger.h"
 
 #include "ClipboardPrivate.h"
diff --git a/src/platform/gui/osx/Cursor.mm b/src/platform/gui/osx/Cursor.mm
index 9c25fdbd..e9d8f484 100644
--- a/src/platform/gui/osx/Cursor.mm
+++ b/src/platform/gui/osx/Cursor.mm
@@ -2,10 +2,6 @@
 #include "CursorPrivate.h"
 #include "cru/base/Exception.h"
 
-#include "cru/platform/gui/Cursor.h"
-#include "cru/platform/gui/UiApplication.h"
-#include "cru/platform/gui/osx/Resource.h"
-
 #include <memory>
 
 namespace cru::platform::gui::osx {
diff --git a/src/platform/gui/osx/InputMethod.mm b/src/platform/gui/osx/InputMethod.mm
index c17dab3d..10003a5d 100644
--- a/src/platform/gui/osx/InputMethod.mm
+++ b/src/platform/gui/osx/InputMethod.mm
@@ -1,11 +1,12 @@
 #include "cru/platform/gui/osx/InputMethod.h"
 
-#import <AppKit/AppKit.h>
 #include "InputMethodPrivate.h"
 #include "WindowPrivate.h"
 #include "cru/base/log/Logger.h"
 #include "cru/platform/gui/osx/Window.h"
 
+#import <AppKit/AppKit.h>
+
 namespace cru::platform::gui::osx {
 namespace details {
 OsxInputMethodContextPrivate::OsxInputMethodContextPrivate(
diff --git a/src/platform/gui/osx/Menu.mm b/src/platform/gui/osx/Menu.mm
index 0eea19ec..62e9fe64 100644
--- a/src/platform/gui/osx/Menu.mm
+++ b/src/platform/gui/osx/Menu.mm
@@ -2,7 +2,7 @@
 
 #include "KeyboardPrivate.h"
 #import "MenuPrivate.h"
-#include "cru/base/Osx.h"
+#include "cru/base/platform/osx/Base.h"
 
 #import <AppKit/NSApplication.h>
 
diff --git a/src/platform/gui/osx/UiApplication.mm b/src/platform/gui/osx/UiApplication.mm
index fca21075..19fcdc87 100644
--- a/src/platform/gui/osx/UiApplication.mm
+++ b/src/platform/gui/osx/UiApplication.mm
@@ -1,13 +1,9 @@
 #include "cru/platform/gui/osx/UiApplication.h"
 
 #include "ClipboardPrivate.h"
-#include "cru/base/Osx.h"
+#include "cru/base/platform/osx/Base.h"
 #include "cru/base/log/Logger.h"
-#include "cru/platform/graphics/Factory.h"
 #include "cru/platform/graphics/quartz/Factory.h"
-#include "cru/platform/gui/Base.h"
-#include "cru/platform/gui/UiApplication.h"
-#include "cru/platform/gui/Window.h"
 #include "cru/platform/gui/osx/Clipboard.h"
 #include "cru/platform/gui/osx/Cursor.h"
 #include "cru/platform/gui/osx/Menu.h"
diff --git a/src/platform/gui/osx/Window.mm b/src/platform/gui/osx/Window.mm
index ca2de573..600f4902 100644
--- a/src/platform/gui/osx/Window.mm
+++ b/src/platform/gui/osx/Window.mm
@@ -3,18 +3,16 @@
 
 #include "CursorPrivate.h"
 #include "InputMethodPrivate.h"
-#include "cru/base/Osx.h"
+#include "cru/base/platform/osx/Base.h"
 #include "cru/base/Range.h"
 #include "cru/base/log/Logger.h"
 #include "cru/platform/graphics/NullPainter.h"
-#include "cru/platform/graphics/quartz/Convert.h"
 #include "cru/platform/graphics/quartz/Painter.h"
 #include "cru/platform/gui/Input.h"
 #include "cru/platform/gui/TimerHelper.h"
 #include "cru/platform/gui/osx/Cursor.h"
 #include "cru/platform/gui/osx/InputMethod.h"
 #include "cru/platform/gui/osx/Keyboard.h"
-#include "cru/platform/gui/osx/Resource.h"
 #include "cru/platform/gui/osx/UiApplication.h"
 
 #include <AppKit/AppKit.h>
diff --git a/src/platform/gui/osx/WindowPrivate.h b/src/platform/gui/osx/WindowPrivate.h
index 9e1b2a6c..913f2b2b 100644
--- a/src/platform/gui/osx/WindowPrivate.h
+++ b/src/platform/gui/osx/WindowPrivate.h
@@ -3,7 +3,6 @@
 
 #include "cru/base/Event.h"
 #include "cru/platform/gui/TimerHelper.h"
-#include "cru/platform/gui/Window.h"
 #include "cru/platform/gui/osx/Cursor.h"
 
 #import <AppKit/AppKit.h>
diff --git a/src/platform/osx/CMakeLists.txt b/src/platform/osx/CMakeLists.txt
deleted file mode 100644
index 43a0a22b..00000000
--- a/src/platform/osx/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-add_library(CruPlatformBaseOsx
-	Resource.cpp
-)
-
-find_library(FOUNDATION Foundation REQUIRED)
-find_library(CORE_FOUNDATION CoreFoundation REQUIRED)
-
-target_link_libraries(CruPlatformBaseOsx PUBLIC CruPlatformBase ${FOUNDATION} ${CORE_FOUNDATION})
diff --git a/src/platform/osx/Resource.cpp b/src/platform/osx/Resource.cpp
deleted file mode 100644
index 0b098d6f..00000000
--- a/src/platform/osx/Resource.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "cru/platform/osx/Resource.h"