From be6642dc096842f0531c7687cf06f15fd1d0ccd6 Mon Sep 17 00:00:00 2001
From: Nao Pross <naopross@thearcway.org>
Date: Sun, 25 Feb 2018 21:11:02 +0100
Subject: Update CMakeLists and Makefile

---
 Makefile | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'Makefile')

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 .
-- 
cgit v1.2.1