From 8b37a98170154d4acdf61d4f3c43f5f8604d30f1 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Wed, 27 Mar 2019 01:02:50 -0400
Subject: [PATCH] Settled unix/CMakeLists.txt (was already complete in
 unix/meson.build) and darwin/CMakeLists.txt (just had one other thing needing
 to be moved).

---
 darwin/CMakeLists.txt | 64 -----------------------------------------
 darwin/meson.build    | 10 +++++--
 unix/CMakeLists.txt   | 66 -------------------------------------------
 3 files changed, 7 insertions(+), 133 deletions(-)
 delete mode 100644 darwin/CMakeLists.txt
 delete mode 100644 unix/CMakeLists.txt

diff --git a/darwin/CMakeLists.txt b/darwin/CMakeLists.txt
deleted file mode 100644
index bd7d576a..00000000
--- a/darwin/CMakeLists.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-# 3 june 2016
-
-list(APPEND _LIBUI_SOURCES
-	darwin/aat.m
-	darwin/alloc.m
-	darwin/area.m
-	darwin/areaevents.m
-	darwin/attrstr.m
-	darwin/autolayout.m
-	darwin/box.m
-	darwin/button.m
-	darwin/checkbox.m
-	darwin/colorbutton.m
-	darwin/combobox.m
-	darwin/control.m
-	darwin/datetimepicker.m
-	darwin/debug.m
-	darwin/draw.m
-	darwin/drawtext.m
-	darwin/editablecombo.m
-	darwin/entry.m
-	darwin/fontbutton.m
-	darwin/fontmatch.m
-	darwin/fonttraits.m
-	darwin/fontvariation.m
-	darwin/form.m
-	darwin/future.m
-	darwin/graphemes.m
-	darwin/grid.m
-	darwin/group.m
-	darwin/image.m
-	darwin/label.m
-	darwin/main.m
-	darwin/map.m
-	darwin/menu.m
-	darwin/multilineentry.m
-	darwin/opentype.m
-	darwin/progressbar.m
-	darwin/radiobuttons.m
-	darwin/scrollview.m
-	darwin/separator.m
-	darwin/slider.m
-	darwin/spinbox.m
-	darwin/stddialogs.m
-	darwin/tab.m
-	darwin/table.m
-	darwin/tablecolumn.m
-	darwin/text.m
-	darwin/undocumented.m
-	darwin/util.m
-	darwin/window.m
-	darwin/winmoveresize.m
-)
-set(_LIBUI_SOURCES ${_LIBUI_SOURCES} PARENT_SCOPE)
-
-# TODO is this correct?
-list(APPEND _LIBUI_INCLUDEDIRS
-	darwin
-)
-set(_LIBUI_INCLUDEDIRS _LIBUI_INCLUDEDIRS PARENT_SCOPE)
-
-set(_LIBUI_LIBS
-	objc "-framework Foundation" "-framework AppKit"
-PARENT_SCOPE)
diff --git a/darwin/meson.build b/darwin/meson.build
index 238a35fc..c2510464 100644
--- a/darwin/meson.build
+++ b/darwin/meson.build
@@ -52,9 +52,13 @@ libui_sources += [
 	'darwin/winmoveresize.m',
 ]
 
-libui_deps += [dependency('appleframeworks',
-	modules: ['Foundation', 'AppKit'],
-	required: true)]
+libui_deps += [
+	meson.get_compiler('objc').find_library('objc',
+		required: true),
+	dependency('appleframeworks',
+		modules: ['Foundation', 'AppKit'],
+		required: true),
+]
 libui_soversion = 'A'
 # the / is required by some older versions of OS X
 libui_rpath = '@executable_path/'
diff --git a/unix/CMakeLists.txt b/unix/CMakeLists.txt
deleted file mode 100644
index 5c9425d2..00000000
--- a/unix/CMakeLists.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-# 3 june 2016
-
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(GTK REQUIRED gtk+-3.0)
-
-list(APPEND _LIBUI_SOURCES
-	unix/alloc.c
-	unix/area.c
-	unix/attrstr.c
-	unix/box.c
-	unix/button.c
-	unix/cellrendererbutton.c
-	unix/checkbox.c
-	unix/child.c
-	unix/colorbutton.c
-	unix/combobox.c
-	unix/control.c
-	unix/datetimepicker.c
-	unix/debug.c
-	unix/draw.c
-	unix/drawmatrix.c
-	unix/drawpath.c
-	unix/drawtext.c
-	unix/editablecombo.c
-	unix/entry.c
-	unix/fontbutton.c
-	unix/fontmatch.c
-	unix/form.c
-	unix/future.c
-	unix/graphemes.c
-	unix/grid.c
-	unix/group.c
-	unix/image.c
-	unix/label.c
-	unix/main.c
-	unix/menu.c
-	unix/multilineentry.c
-	unix/opentype.c
-	unix/progressbar.c
-	unix/radiobuttons.c
-	unix/separator.c
-	unix/slider.c
-	unix/spinbox.c
-	unix/stddialogs.c
-	unix/tab.c
-	unix/table.c
-	unix/tablemodel.c
-	unix/text.c
-	unix/util.c
-	unix/window.c
-)
-set(_LIBUI_SOURCES ${_LIBUI_SOURCES} PARENT_SCOPE)
-
-list(APPEND _LIBUI_INCLUDEDIRS
-	unix
-)
-set(_LIBUI_INCLUDEDIRS _LIBUI_INCLUDEDIRS PARENT_SCOPE)
-
-# TODO the other variables don't work?
-set(_LIBUI_CFLAGS
-	${GTK_CFLAGS}
-PARENT_SCOPE)
-
-set(_LIBUI_LIBS
-	${GTK_LDFLAGS} m ${CMAKE_DL_LIBS}
-PARENT_SCOPE)