From f3a898b0f537031a0c93e80dffb12aa18252bee5 Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Sat, 1 Feb 2025 17:48:53 +0100
Subject: Update ctor

---
 ctor.cc | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'ctor.cc')

diff --git a/ctor.cc b/ctor.cc
index 55cd31a..ad39f25 100644
--- a/ctor.cc
+++ b/ctor.cc
@@ -6,9 +6,11 @@
 #include <string>
 #include <vector>
 
-int execute(const std::string& command,
-            const std::vector<std::string>& args,
-            bool verbose = true);
+int execute(const ctor::settings& settings,
+            const std::string& command,
+            const std::vector<std::string>& args = {},
+            const std::map<std::string, std::string>& env = {},
+            bool terminate = false);
 
 namespace
 {
@@ -29,9 +31,9 @@ ctor::build_configurations myConfigs(const ctor::settings& settings)
 				"src/mainwindow.cc",
 				"src/viewer.cc",
 				"src/client.cc",
-				settings.builddir + "/moc_mainwindow.cc",
-				settings.builddir + "/moc_viewer.cc",
-				settings.builddir + "/moc_client.cc",
+				{settings.builddir + "/moc_mainwindow.cc"},
+				{settings.builddir + "/moc_viewer.cc"},
+				{settings.builddir + "/moc_client.cc"},
 			},
 			.flags = {
 				.cxxflags = {
@@ -60,8 +62,8 @@ ctor::build_configurations myConfigs(const ctor::settings& settings)
 			               const ctor::build_configuration& config,
 			               const ctor::settings& settings)
 			{
-				return execute("/usr/bin/moc", {"-I../src", "-o", output, input},
-				               settings.verbose > 0);
+				return execute(settings, "/usr/bin/moc",
+				               {"-I../src", "-o", output, input});
 			}
 		};
 
@@ -73,7 +75,7 @@ ctor::build_configurations myConfigs(const ctor::settings& settings)
 			.target = "qookie-cast-client",  // output filename
 			.sources = {
 				"src/qookie-cast-client.cc",
-				settings.builddir + "/moc_qookie-cast-client.cc",
+				{settings.builddir + "/moc_qookie-cast-client.cc"},
 			},
 			.flags = {
 				.cxxflags = {
-- 
cgit v1.2.3