summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2019-01-25 01:05:29 +0100
committerNao Pross <naopross@thearcway.org>2019-01-25 01:05:29 +0100
commit703067972f2f66e53c944dc1fa202dfda6546e6b (patch)
treed54cc5c8b2c9386a2cef1fb44ab95e0a22b8471d
parentMerge remote-tracking branch 'nao/master' (diff)
downloadflatland-703067972f2f66e53c944dc1fa202dfda6546e6b.tar.gz
flatland-703067972f2f66e53c944dc1fa202dfda6546e6b.zip
Delete bin and test/makefile update .gitignore
-rw-r--r--.gitignore1
-rwxr-xr-xbin/libflatland.sobin364992 -> 0 bytes
m---------lib/libmm0
-rw-r--r--test/makefile11
4 files changed, 1 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index a054592..fe3ce13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
# build files
+bin
build
**/*.o
diff --git a/bin/libflatland.so b/bin/libflatland.so
deleted file mode 100755
index 670d794..0000000
--- a/bin/libflatland.so
+++ /dev/null
Binary files differ
diff --git a/lib/libmm b/lib/libmm
-Subproject e6595cf9c527e97198806c48aa0a14ae8e895e8
+Subproject ba03d198b82733043919fda918a80f4bb81800a
diff --git a/test/makefile b/test/makefile
deleted file mode 100644
index f4c4ba1..0000000
--- a/test/makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-
-BIN:= test
-SRC:= main.cpp
-INCLUDE:= -I ../engine/include
-LIBS:= -lSDL ../bin/libflatland.so
-
-$(BIN):
- g++ -o $(BIN) $(SRC) $(INCLUDE) $(LIBS) -std=c++11
-
-all: $(BIN)
-