aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormafaldo <mafaldo@heavyhammer.home>2018-02-17 00:32:26 +0100
committermafaldo <mafaldo@heavyhammer.home>2018-02-17 00:32:26 +0100
commit452805722ee8dcc9f670975550f81fd6011e428d (patch)
treefceeff6f4d3796407ad97677116e4027e47debfc
parentadd Item type, use for MeleeWeapon (diff)
parentUpdate Makefile to pass arguments to cmake (diff)
downloadSubconscious-old-452805722ee8dcc9f670975550f81fd6011e428d.tar.gz
Subconscious-old-452805722ee8dcc9f670975550f81fd6011e428d.zip
Merge makefile
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7540484..88e31ec 100644
--- a/Makefile
+++ b/Makefile
@@ -6,9 +6,8 @@ java:
runjava: java
gradle run
-
cpp:
- cmake --build build
+ cmake --build build -- $(filter-out $@,$(MAKECMDGOALS))
runcpp: cpp
./build/exe/main/main