From 5746abc233d24e39e84effb481b3baac1e9fe19b Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Thu, 26 May 2022 16:56:36 +0200
Subject: Make use of ctor externals for better cross-system compilation
 support.

---
 ctor.cc                   | 63 ++++++++++++++++++++++++++++-------------------
 libctor                   |  2 +-
 src/client.cc             |  4 +--
 src/client.h              |  4 +--
 src/mainwindow.cc         | 19 +++++++-------
 src/mainwindow.h          |  4 +--
 src/qookie-cast-client.cc |  8 +++---
 src/qookie-cast-client.h  | 12 ++++-----
 src/qookie.cc             |  2 +-
 src/viewer.cc             |  6 ++---
 src/viewer.h              |  2 +-
 11 files changed, 69 insertions(+), 57 deletions(-)

diff --git a/ctor.cc b/ctor.cc
index 7abd01b..401911c 100644
--- a/ctor.cc
+++ b/ctor.cc
@@ -61,23 +61,12 @@ BuildConfigurations myConfigs()
 			},
 			.flags = {
 				.cxxflags = {
-					"-I/usr/include/qt5",
-					"-I/usr/include/qt5/QtCore",
-					"-I/usr/include/qt5/QtGui",
-					"-I/usr/include/qt5/QtWidgets",
-					"-I/usr/include/qt5/QtNetwork",
 					"-fPIC",
 					"-Wall", "-Werror", "-Wextra",// "-Wconversion",
 					"-g",
 				},
-				.ldflags = {
-					"-lQt5Core",
-					"-lQt5Network",
-					"-lQt5Gui",
-					"-lQt5Widgets",
-					"-lsqlite3",
-				}
 			},
+			.externals = { "qt", "sqlite" },
 		};
 	std::vector<Source> qookie_mocs =
 		eval_mocs("src",
@@ -102,24 +91,12 @@ BuildConfigurations myConfigs()
 			},
 			.flags = {
 				.cxxflags = {
-					"-I/usr/include/qt5",
-					"-I/usr/include/qt5/QtCore",
-					"-I/usr/include/qt5/QtGui",
-					"-I/usr/include/qt5/QtWidgets",
-					"-I/usr/include/qt5/QtNetwork",
-					"-I/usr/include/qt5/QtWebKit",
 					"-fPIC",
 					"-Wall", "-Werror", "-Wextra",// "-Wconversion",
 					"-g",
 				},
-				.ldflags = {
-					"-lQt5Core",
-					"-lQt5Network",
-					"-lQt5Gui",
-					"-lQt5Widgets",
-//					"-lQt5WebKit",
-				}
 			},
+			.externals = {"qt"},
 		};
 
 	std::vector<Source> qookie_cast_client_mocs =
@@ -134,7 +111,41 @@ BuildConfigurations myConfigs()
 
 	return {qookie, qookie_cast_client};
 }
+
+ExternalConfigurations ctorExtConfigs()
+{
+	return
+	{
+		{
+			.name = "qt",
+			.external = ExternalManual{
+				.flags = {
+					.cxxflags = {
+						"-I/usr/include/qt5",
+					},
+					.ldflags = {
+						"-lQt5Core",
+						"-lQt5Network",
+						"-lQt5Gui",
+						"-lQt5Widgets",
+					},
+				},
+			},
+		},
+		{
+			.name = "sqlite",
+			.external = ExternalManual{
+				.flags = {
+					.ldflags = {
+						"-lsqlite3",
+					},
+				},
+			},
+		},
+	};
+}
 }
 
-// Register callback
+// Register callbacks
 REG(myConfigs);
+REG(ctorExtConfigs);
diff --git a/libctor b/libctor
index 4b6c99b..fb88dc7 160000
--- a/libctor
+++ b/libctor
@@ -1 +1 @@
-Subproject commit 4b6c99baaef78580375a2575c32ce1b6c30bf8cb
+Subproject commit fb88dc797f1f5f420416521d4b3088bf6b8450a5
diff --git a/src/client.cc b/src/client.cc
index 1a7401d..94f4f67 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -2,8 +2,8 @@
 
 #include <cstdint>
 
-#include <QTcpSocket>
-#include <QTimer>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QTimer>
 
 Client::Client(QObject *parent)
 	: QObject(parent)
diff --git a/src/client.h b/src/client.h
index a03a648..a634561 100644
--- a/src/client.h
+++ b/src/client.h
@@ -1,8 +1,8 @@
 // -*- c++ -*-
 #pragma once
 
-#include <QtCore>
-#include <QtNetwork>
+#include <QtNetwork/QTcpSocket>
+#include <QtCore/QTimer>
 
 class QTcpSocket;
 class QTimer;
diff --git a/src/mainwindow.cc b/src/mainwindow.cc
index a443476..253d2c9 100644
--- a/src/mainwindow.cc
+++ b/src/mainwindow.cc
@@ -28,15 +28,16 @@
 
 #include <iostream>
 
-#include <QToolBar>
-#include <QDockWidget>
-#include <QLabel>
-#include <QPixmap>
-#include <QListWidget>
-#include <QPainter>
-#include <QVBoxLayout>
-#include <QLineEdit>
-#include <QAction>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QDockWidget>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QAction>
+
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 
 #include "database.h"
 #include "viewer.h"
diff --git a/src/mainwindow.h b/src/mainwindow.h
index ece4a85..3457f42 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -26,8 +26,8 @@
  */
 #pragma once
 
-#include <QMainWindow>
-#include <QListWidget>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QListWidget>
 
 #include "client.h"
 
diff --git a/src/qookie-cast-client.cc b/src/qookie-cast-client.cc
index e33edfd..d109249 100644
--- a/src/qookie-cast-client.cc
+++ b/src/qookie-cast-client.cc
@@ -3,15 +3,15 @@
 #include <cstdint>
 #include <iostream>
 
-#include <QApplication>
-#include <QTabWidget>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QTabWidget>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
 // Qt4 support
-#include <QWebView>
+#include <QtWidgets/QWebView>
 #define WebView QWebView
 #else
-#include <QTextEdit>
+#include <QtWidgets/QTextEdit>
 using WebView = QTextEdit;
 #endif
 
diff --git a/src/qookie-cast-client.h b/src/qookie-cast-client.h
index e22b8e7..8e4299a 100644
--- a/src/qookie-cast-client.h
+++ b/src/qookie-cast-client.h
@@ -1,7 +1,8 @@
 // -*- c++ -*-
-#include <QtCore>
-#include <QtNetwork>
-#include <QTabWidget>
+
+#include <QtNetwork/QTcpSocket>
+#include <QtNetwork/QTcpServer>
+#include <QtWidgets/QTabWidget>
 
 class Server
 	: public QObject
@@ -29,9 +30,8 @@ class MyTabs : public QTabWidget
 {
 	Q_OBJECT
 public:
-        MyTabs();
+	MyTabs();
 
 public slots:
-        void doCloseIt(int index);
+	void doCloseIt(int index);
 };
-
diff --git a/src/qookie.cc b/src/qookie.cc
index b818fa1..538e900 100644
--- a/src/qookie.cc
+++ b/src/qookie.cc
@@ -24,7 +24,7 @@
  *  along with Qookie; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
  */
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 #include <iostream>
 
diff --git a/src/viewer.cc b/src/viewer.cc
index 43b82dd..af02b28 100644
--- a/src/viewer.cc
+++ b/src/viewer.cc
@@ -28,9 +28,9 @@
 
 #include <iostream>
 
-#include <QTextEdit>
-#include <QLineEdit>
-#include <QVBoxLayout>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QVBoxLayout>
 
 #include "recipe.h"
 #include "client.h"
diff --git a/src/viewer.h b/src/viewer.h
index 83ef9a5..244bcc6 100644
--- a/src/viewer.h
+++ b/src/viewer.h
@@ -26,7 +26,7 @@
  */
 #pragma once
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 #include "recipe.h"
 
-- 
cgit v1.2.3