diff options
| author | Nao Pross <naopross@thearcway.org> | 2018-12-15 14:59:28 +0100 |
|---|---|---|
| committer | Nao Pross <naopross@thearcway.org> | 2018-12-15 14:59:28 +0100 |
| commit | 03a92d22027ef0738d1ebfd59145236905751425 (patch) | |
| tree | f488a709b1180c6f5e82c71c3fcd39c2a71e6576 /Makefile | |
| parent | Change Tile.loaded to Tile.active (diff) | |
| download | Subconscious-java-03a92d22027ef0738d1ebfd59145236905751425.tar.gz Subconscious-java-03a92d22027ef0738d1ebfd59145236905751425.zip | |
Remove Gson dependency start custom libjtmx implementation
This commit breaks MapLoader and by consequence the entire game.
Being in Java 9+ now we will have multiple modules, namely:
- libjtmx: separate minimal tmx (tiled) files loader library
- subconscious: the game itself
Diffstat (limited to '')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -1,6 +1,5 @@ # project classes configuration MAINCLASS := subconscious.Subconscious -SOURCES := $(shell find src -iname '*.java') # debug or release mode DEBUG=1 @@ -9,7 +8,6 @@ LIMIT_RAM=1 # java compiler configuraton JAVAC := javac JAVAC_ARGS := -Xlint:all -Xdiags:verbose \ - -classpath lib/gson-2.6.2.jar:. \ -sourcepath src # java debugger configuration @@ -19,7 +17,7 @@ USE_JDB := 0 # java runtime configuration JAVA := java -JAVA_ARGS := -cp ../lib/gson-2.6.2.jar:. +JAVA_ARGS := ifeq ($(LIMIT_RAM),1) JAVA_ARGS += -Xmx2G endif @@ -33,10 +31,13 @@ endif # recipes .PHONY: all run jar classes dirs clean -all: classes +all: subconscious libjtmx -classes: dirs - $(JAVAC) $(JAVAC_ARGS) -d build $(SOURCES) +libjtmx: dirs + $(JAVAC) $(JAVAC_ARGS) -d build $(shell find src/libjtmx -iname '*.java') + +subconscious: dirs + $(JAVAC) $(JAVAC_ARGS) -d build $(shell find src/subconscious -iname '*.java') # copy resources folder cp -r src/subconscious/res build/subconscious/ |