summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2023-01-14 12:53:23 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2023-01-14 12:53:23 +0100
commitd4cbc1e1a642d56e7f5628c6a35a329e0a6bd136 (patch)
treebf38634c4a9607aacf0f9e988d957a64f6b09d47
parent9cdbb0cf222050b061d1cfdf21968cd775bd1eee (diff)
Update libctordevelop
-rw-r--r--ctor.cc20
m---------libctor0
2 files changed, 10 insertions, 10 deletions
diff --git a/ctor.cc b/ctor.cc
index 3c6d6ee..55cd31a 100644
--- a/ctor.cc
+++ b/ctor.cc
@@ -1,5 +1,5 @@
// -*- c++ -*-
-#include <libctor.h>
+#include <ctor.h>
#include <filesystem>
#include <iostream>
@@ -12,12 +12,12 @@ int execute(const std::string& command,
namespace
{
-BuildConfigurations myConfigs(const Settings& settings)
+ctor::build_configurations myConfigs(const ctor::settings& settings)
{
//
// Qookie main application
//
- BuildConfiguration qookie =
+ ctor::build_configuration qookie =
{
.target = "qookie", // output filename
.sources = {
@@ -47,7 +47,7 @@ BuildConfigurations myConfigs(const Settings& settings)
//
// Moc generation for all configurations
//
- BuildConfiguration mocs =
+ ctor::build_configuration mocs =
{
.sources = {
{ "src/mainwindow.h", "moc_mainwindow.cc"},
@@ -57,8 +57,8 @@ BuildConfigurations myConfigs(const Settings& settings)
},
.function = [](const std::string& input,
const std::string& output,
- const BuildConfiguration& config,
- const Settings& settings)
+ const ctor::build_configuration& config,
+ const ctor::settings& settings)
{
return execute("/usr/bin/moc", {"-I../src", "-o", output, input},
settings.verbose > 0);
@@ -68,7 +68,7 @@ BuildConfigurations myConfigs(const Settings& settings)
//
// Qookie-cast client
//
- BuildConfiguration qookie_cast_client =
+ ctor::build_configuration qookie_cast_client =
{
.target = "qookie-cast-client", // output filename
.sources = {
@@ -89,13 +89,13 @@ BuildConfigurations myConfigs(const Settings& settings)
return { qookie, mocs, qookie_cast_client };
}
-ExternalConfigurations ctorExtConfigs(const Settings& settings)
+ctor::external_configurations ctorExtConfigs(const ctor::settings& settings)
{
return
{
{
.name = "qt",
- .external = ExternalManual{
+ .external = ctor::external_manual{
.flags = {
.cxxflags = {
"-I/usr/include/qt5",
@@ -111,7 +111,7 @@ ExternalConfigurations ctorExtConfigs(const Settings& settings)
},
{
.name = "sqlite",
- .external = ExternalManual{
+ .external = ctor::external_manual{
.flags = {
.ldflags = {
"-lsqlite3",
diff --git a/libctor b/libctor
-Subproject 7a16146600384272baf7fb2fc0fc64f59b17ffe
+Subproject 321f25af1ba33d8409cd294b4f50d0d3e79cf3b