diff options
| author | Nao Pross <naopross@thearcway.org> | 2019-01-22 18:33:28 +0100 |
|---|---|---|
| committer | Nao Pross <naopross@thearcway.org> | 2019-01-22 18:38:02 +0100 |
| commit | dc85a4bfc844175a88da1aae993737cc744d288a (patch) | |
| tree | e4dcfa16f587d4a4eab5c1ab4750bb53b7fc5f77 | |
| parent | Update .gitmodules for libwsdl2 (renamed libwrapsdl2) (diff) | |
| download | flatland-dc85a4bfc844175a88da1aae993737cc744d288a.tar.gz flatland-dc85a4bfc844175a88da1aae993737cc744d288a.zip | |
Include libraries in ninja build process
| -rwxr-xr-x | configure.py | 14 | ||||
| m--------- | lib/libmm | 0 | ||||
| m--------- | lib/libwsdl2 | 0 | ||||
| -rw-r--r-- | ninja/rules.ninja | 8 |
4 files changed, 17 insertions, 5 deletions
diff --git a/configure.py b/configure.py index 85cfd0d..1bf6b31 100755 --- a/configure.py +++ b/configure.py @@ -15,12 +15,20 @@ def find_sources(path): with open("build.ninja", "w") as bf: - # find engine sources - sources, objects = find_sources("engine") - # include rules print("include ninja/rules.ninja\n", file=bf) + # build libmm dependencies + print("build lib/libmm/build/libmm.so: ninja lib/libmm", file=bf) + print("build lib/libmm/build/libmm.a: ninja lib/libmm", file=bf) + + # build libwsdl2 dependencies + print("build lib/libwsdl2/build/libwsdl2.so: ninja lib/libmm", file=bf) + print("build lib/libwsdl2/build/libwsdl2.a: ninja lib/libmm", file=bf) + + # find engine sources + sources, objects = find_sources("engine") + # create build directories print("build build/engine: mkdir\n", file=bf) print("build build/test: mkdir\n", file=bf) diff --git a/lib/libmm b/lib/libmm -Subproject e6595cf9c527e97198806c48aa0a14ae8e895e8 +Subproject dbf39df8950b2ba03c59804004eb0f6c36a134b diff --git a/lib/libwsdl2 b/lib/libwsdl2 -Subproject 0af63017da578e5838f9b9dde6fdcc58f71fb23 +Subproject 736ec71fce673d5aa88228b96acfe6c6862a223 diff --git a/ninja/rules.ninja b/ninja/rules.ninja index 72cc23f..ee36140 100644 --- a/ninja/rules.ninja +++ b/ninja/rules.ninja @@ -1,7 +1,7 @@ includes = -I engine/include cflags = -Wall -pedantic -fPIC -std=c++17 -DDEBUG $includes -libs = -lSDL2 +libs = -lSDL2 lib/libmm/build/libmm.a lib/libwsdl2/build/libwsdl2.a lflags = $libs flags = -fdiagnostics-color @@ -11,7 +11,7 @@ rule mkdir description = creating directory $out rule cpp - command = g++ $flags $cflags -c $in -o $out $lflags + command = g++ $flags $cflags -c $in -o $out description = compiling $in rule link @@ -25,3 +25,7 @@ rule link-shared rule link-static command = ar rvs $out $in description = creating archive $out + +rule ninja + command = ninja -C $in + description = running ninja in subdirectory $in |