summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2021-08-29 13:24:03 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2021-08-29 13:24:03 +0200
commit77582c4c6804dade46cc7bf991f48b00e1391eff (patch)
treeafcac42f307bb6b57f2b32569cf5bdd29ad7c468
parent5da56616cccf4e595ec6a556cf1aef40b37746e3 (diff)
Move getoptpp submodule into src as well.
-rw-r--r--.gitmodules2
-rwxr-xr-xbootstrap.sh4
-rw-r--r--cppbuild.cc2
m---------src/getoptpp (renamed from getoptpp)0
4 files changed, 5 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index 1c313f3..3e401a5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "getoptpp"]
- path = getoptpp
+ path = src/getoptpp
url = git://git.drumgizmo.org/getoptpp.git
diff --git a/bootstrap.sh b/bootstrap.sh
index e1ee5eb..a232740 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,2 +1,4 @@
#!/bin/bash
-g++ -std=c++17 -I. -Isrc -pthread src/*.cc cppbuild.cc -o cppbuild
+echo "Bootstrapping..."
+g++ -std=c++17 -I. -Isrc -pthread src/*.cc cppbuild.cc -o cppbuild && \
+echo "Done. Now run ./cppbuild to build."
diff --git a/cppbuild.cc b/cppbuild.cc
index dc3ab19..5c6d885 100644
--- a/cppbuild.cc
+++ b/cppbuild.cc
@@ -28,7 +28,7 @@ BuildConfigurations cppbuildConfigs()
"-s",
"-Wall",
"-Werror",
- "-I.",
+ "-Isrc",
},
}
};
diff --git a/getoptpp b/src/getoptpp
-Subproject 9ff20ef857429619267e3f156a4f81ad9e1eb8c
+Subproject 9ff20ef857429619267e3f156a4f81ad9e1eb8c