summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2018-12-12 03:20:33 +0100
committerNao Pross <naopross@thearcway.org>2018-12-12 03:20:33 +0100
commite34b87146d28c1efcf607cf3755059fe4cf124f5 (patch)
tree6f813ec6a628ef135b7da0960a5c8e3f964e0339
parentMinor access and synchronization corrections (diff)
downloadSubconscious-java-e34b87146d28c1efcf607cf3755059fe4cf124f5.tar.gz
Subconscious-java-e34b87146d28c1efcf607cf3755059fe4cf124f5.zip
Update makefile to allow disablig -Xmx flag
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index a3f220e..26cecdc 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@ SOURCES := $(shell find src -iname '*.java')
# debug or release mode
DEBUG=1
+LIMIT_RAM=1
# java compiler configuraton
JAVAC := javac
@@ -18,7 +19,10 @@ USE_JDB := 0
# java runtime configuration
JAVA := java
-JAVA_ARGS := -cp ../lib/gson-2.6.2.jar:. -Xmx2G
+JAVA_ARGS := -cp ../lib/gson-2.6.2.jar:.
+ifeq ($(LIMIT_RAM),1)
+ JAVA_ARGS += -Xmx2G
+endif
ifeq ($(USE_JDB),1)
JAVA_ARGS += -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
endif