Update configure.py and Ninja rules

Ninja now builds in the directory 'build' instead of 'bin' and,
a static library build rule has been added.

2 files changed, 15 insertions, 9 deletions

diff --git a/configure.py b/configure.py
index 1cb3fd7..85cfd0d 100755
--- a/configure.py
+++ b/configure.py
@@ -8,7 +8,7 @@ def find_sources(path):
 
     # add path prefix to files
     sources = tuple(map(lambda f: path + "/" + f, sources))
-    objects = tuple(map(lambda f: "bin/" + path + "/" + f, objects))
+    objects = tuple(map(lambda f: "build/" + path + "/" + f, objects))
 
     return sources, objects
 
@@ -22,8 +22,8 @@ with open("build.ninja", "w") as bf:
     print("include ninja/rules.ninja\n", file=bf)
 
     # create build directories
-    print("build bin/engine: mkdir\n", file=bf)
-    print("build bin/test: mkdir\n", file=bf)
+    print("build build/engine: mkdir\n", file=bf)
+    print("build build/test: mkdir\n", file=bf)
 
 
     # build engine files
@@ -31,7 +31,9 @@ with open("build.ninja", "w") as bf:
         print("build {}: cpp {}".format(o, s), file=bf)
 
     # build engine library
-    print("\nbuild bin/libflatland.so: link-shared " + " ".join(objects) + "\n", file=bf)
+    print("\nbuild build/libflatland.so: link-shared " + " ".join(objects), file=bf)
+    print("\nbuild build/libflatland.a: link-static " + " ".join(objects), file=bf)
+    print("\n", file=bf)
 
 
     # find test sources
@@ -42,4 +44,4 @@ with open("build.ninja", "w") as bf:
     for s, o, b in zip(sources, objects, binaries):
         print("build {}: cpp {}".format(o, s), file=bf)
         print("build {}: link {}".format(b, o), file=bf)
-        print("    lflags = $lflags ../bin/libflatland.so\n", file=bf)
+        print("    lflags = $lflags ../build/libflatland.so\n", file=bf)
diff --git a/ninja/rules.ninja b/ninja/rules.ninja
index 2a56923..72cc23f 100644
--- a/ninja/rules.ninja
+++ b/ninja/rules.ninja
@@ -1,8 +1,8 @@
 includes = -I engine/include
-cflags = -Wall -pedantic -fPIC -std=c++17 $includes
+cflags = -Wall -pedantic -fPIC -std=c++17 -DDEBUG $includes
 
-libs = 
-lflags = -lSDL2 $libs
+libs = -lSDL2
+lflags = $libs
 
 flags = -fdiagnostics-color
 
@@ -20,4 +20,8 @@ rule link
 
 rule link-shared
     command = g++ $flags $cflags -shared -o $out $in $lflags
-    description = linking $out
+    description = linking shared object $out
+
+rule link-static
+    command = ar rvs $out $in
+    description = creating archive $out