summaryrefslogtreecommitdiffstats
path: root/configure.py
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2019-01-22 15:50:49 +0100
committerNao Pross <naopross@thearcway.org>2019-01-22 15:50:49 +0100
commitfd92de696f7703a82fa0325593c6f804c32df2bb (patch)
tree484deae73f79d9a6dc221017485d59f90ce66ac9 /configure.py
parentMerge remote-tracking branch 'raffa/master' (diff)
downloadflatland-fd92de696f7703a82fa0325593c6f804c32df2bb.tar.gz
flatland-fd92de696f7703a82fa0325593c6f804c32df2bb.zip
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.
Diffstat (limited to 'configure.py')
-rwxr-xr-xconfigure.py12
1 files changed, 7 insertions, 5 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)