summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2021-06-19 16:03:43 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2021-06-19 16:03:43 +0200
commitf1fda74cb76600b746cc3239f3ebf2f69ce2bf53 (patch)
tree5b035efde13c29115cf76ace5e226951c6bf8f3b
parent55085609d361fe4463f4d226822a9f555e3673a0 (diff)
Clean up example build config files.
-rw-r--r--TODO14
-rw-r--r--cppbuild.cc47
-rw-r--r--subdir/cppbuild.cc50
3 files changed, 14 insertions, 97 deletions
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..34fe79a
--- /dev/null
+++ b/TODO
@@ -0,0 +1,14 @@
+Glob convenience methods
+std::string glob = getFilesInDir(...);
+
+Generate compilation database
+https://clang.llvm.org/docs/JSONCompilationDatabase.html
+
+Add support for pre/post build hooks with conditions
+
+Add shell script targets to be able to generate soucre files that can
+be included as sources in normal build targets.
+For example imageconverter
+
+Compiler selection per-target (for arm cross-compilation)
+
diff --git a/cppbuild.cc b/cppbuild.cc
index 0524d84..b0f3eae 100644
--- a/cppbuild.cc
+++ b/cppbuild.cc
@@ -1,52 +1,5 @@
-#if 0/*
-if [ "cppbuild" -ot "$0" ]
-then
- echo "Rebuilding cppbuild"
- g++ -s -O3 -std=c++17 -pthread $0 libcppbuild.a -o cppbuild
- [ $? != 0 ] && exit 1
-fi
-
-echo "Launching cppbuild"
-./cppbuild $*
-exit $?
-*/
-#endif
-
-#include <vector>
-#include <string>
-#include <utility>
-
#include "libcppbuild.h"
-/*
-Nested build configurations for for example unit-tests in a test folder
-#include "test/cppbuild.cc"
-*/
-
-/*
-Glob convenience methods
-std::string glob = getFilesInDir(...);
-*/
-
-/*
-Compilation database
-https://clang.llvm.org/docs/JSONCompilationDatabase.html
-*/
-
-/*
-En feature mere kunne være: pre-post build hooks
-De vil kunne udtrykkes som intra-build dependencies
-Og så selvfølgelig med conditions
-*/
-
-/*
-Target som er "shell script" eller sådan noget
-så kan man kalde f.eks. imageconvert
-*/
-
-/*
-Compiler selection per-target (for arm cross-compilation)
-*/
namespace
{
BuildConfigurations myConfigs()
diff --git a/subdir/cppbuild.cc b/subdir/cppbuild.cc
index 68c16c8..03b70e6 100644
--- a/subdir/cppbuild.cc
+++ b/subdir/cppbuild.cc
@@ -1,52 +1,5 @@
-#if 0/*
-if [ "cppbuild" -ot "$0" ]
-then
- echo "Rebuilding cppbuild"
- g++ -s -O3 -std=c++17 -pthread $0 libcppbuild.a -o cppbuild
- [ $? != 0 ] && exit 1
-fi
-
-echo "Launching cppbuild"
-./cppbuild $*
-exit $?
-*/
-#endif
-
-#include <vector>
-#include <string>
-#include <utility>
-
#include "../libcppbuild.h"
-/*
-Nested build configurations for for example unit-tests in a test folder
-#include "test/cppbuild.cc"
-*/
-
-/*
-Glob convenience methods
-std::string glob = getFilesInDir(...);
-*/
-
-/*
-Compilation database
-https://clang.llvm.org/docs/JSONCompilationDatabase.html
-*/
-
-/*
-En feature mere kunne være: pre-post build hooks
-De vil kunne udtrykkes som intra-build dependencies
-Og så selvfølgelig med conditions
-*/
-
-/*
-Target som er "shell script" eller sådan noget
-så kan man kalde f.eks. imageconvert
-*/
-
-/*
-Compiler selection per-target (for arm cross-compilation)
-*/
namespace
{
BuildConfigurations myConfigs()
@@ -98,7 +51,6 @@ BuildConfigurations myConfigs()
"../drumgizmo/src/versionstr.cc",
"../drumgizmo/src/zrwrapper.cc",
},
- .depends = {},
.cxxflags = {
"-fPIC",
"-DUI_X11",
@@ -115,8 +67,6 @@ BuildConfigurations myConfigs()
"-I ../drumgizmo/zita-resampler/libs",
"-I ../drumgizmo/pugixml/src",
},
- .cflags = {},
- .ldflags = {}
}
};
}