aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2018-02-25 21:11:02 +0100
committerNao Pross <naopross@thearcway.org>2018-02-25 21:11:02 +0100
commitbe6642dc096842f0531c7687cf06f15fd1d0ccd6 (patch)
treeb7c81d15936e29087f8ec0c0df1c5d334817b0a0 /Makefile
parentFix all warnings (errors with -Werror) (diff)
downloadSubconscious-old-be6642dc096842f0531c7687cf06f15fd1d0ccd6.tar.gz
Subconscious-old-be6642dc096842f0531c7687cf06f15fd1d0ccd6.zip
Update CMakeLists and Makefile
Diffstat (limited to '')
-rw-r--r--Makefile17
1 files changed, 7 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 88e31ec..869ecf0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,14 @@
-all: runcpp
+all: cmake
-java:
- gradle compileJava
-
-runjava: java
- gradle run
+run:
+ build/subconscious
-cpp:
+cmake:
cmake --build build -- $(filter-out $@,$(MAKECMDGOALS))
-runcpp: cpp
- ./build/exe/main/main
-
+gradle:
+ gradle compileJava
+ gradle run
tags:
ctags --extra=+f --exclude=src/main/java -R .