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 +++++++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 37 insertions(+), 26 deletions(-)

(limited to 'ctor.cc')

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);
-- 
cgit v1.2.3