Osx remove Resource.h.

9 files changed, 11 insertions, 19 deletions

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>