From 03a92d22027ef0738d1ebfd59145236905751425 Mon Sep 17 00:00:00 2001
From: Nao Pross <naopross@thearcway.org>
Date: Sat, 15 Dec 2018 14:59:28 +0100
Subject: 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
---
 Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 26cecdc..e3e03b0 100644
--- a/Makefile
+++ b/Makefile
@@ -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/
 
-- 
cgit v1.2.1