summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2020-08-29 08:26:22 +0300
committerJaakko Keränen <jaakko.keranen@iki.fi>2020-08-29 08:26:22 +0300
commitf90104259c4929c86c1af630c4eff62580c3028b (patch)
tree1388a03592107b2bb59d90cc3caccfe7ea5b8305
parent3c63fd4aad97b87ab1f854e5304bbeee5fd76b7d (diff)
Moved macOS sources to parent dir
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/app.c2
-rw-r--r--src/macos.h (renamed from src/ui/macos.h)2
-rw-r--r--src/macos.m (renamed from src/ui/macos.m)6
4 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03d253ea..a5b41da3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,7 +95,7 @@ set (SOURCES
95) 95)
96if (IOS) 96if (IOS)
97elseif (APPLE) 97elseif (APPLE)
98 list (APPEND SOURCES src/ui/macos.m src/ui/macos.h) 98 list (APPEND SOURCES src/macos.m src/macos.h)
99 list (APPEND RESOURCES "res/Lagrange.icns") 99 list (APPEND RESOURCES "res/Lagrange.icns")
100endif () 100endif ()
101if (MSYS) 101if (MSYS)
diff --git a/src/app.c b/src/app.c
index b8909306..e7f31dbe 100644
--- a/src/app.c
+++ b/src/app.c
@@ -55,7 +55,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
55#include <errno.h> 55#include <errno.h>
56 56
57#if defined (iPlatformApple) && !defined (iPlatformIOS) 57#if defined (iPlatformApple) && !defined (iPlatformIOS)
58# include "ui/macos.h" 58# include "macos.h"
59#endif 59#endif
60 60
61iDeclareType(App) 61iDeclareType(App)
diff --git a/src/ui/macos.h b/src/macos.h
index 9369b018..07990090 100644
--- a/src/ui/macos.h
+++ b/src/macos.h
@@ -22,7 +22,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
22 22
23#pragma once 23#pragma once
24 24
25#include "util.h" 25#include "ui/util.h"
26 26
27/* Platform-specific functionality for macOS */ 27/* Platform-specific functionality for macOS */
28 28
diff --git a/src/ui/macos.m b/src/macos.m
index 593c3810..edbb6df0 100644
--- a/src/ui/macos.m
+++ b/src/macos.m
@@ -22,9 +22,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
22 22
23#include "macos.h" 23#include "macos.h"
24#include "app.h" 24#include "app.h"
25#include "command.h" 25#include "ui/command.h"
26#include "widget.h" 26#include "ui/widget.h"
27#include "color.h" 27#include "ui/color.h"
28 28
29#import <AppKit/AppKit.h> 29#import <AppKit/AppKit.h>
30 30