megamanmalte
/
VierGewinnt
1
0
Fork 0
Code Issues 1 Pull Requests 3 Packages Projects Releases Wiki Activity

Merge branch 'fix-make' into 'master' 

Fix make

See merge request !33
This commit is contained in:
Maurizio Bruetsch 2017-10-27 18:22:58 +02:00
parent afddc1ba6e b60a9b4d06
commit 937ba9663d
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -22,6 +22,7 @@ src/player/Human.java \
src/player/malte/MalteAI.java \
src/player/malte/Position.java \
src/player/malte/Sequence.java \
src/player/malte/Item.java \
src/player/maurizio/MaurizioAI.java
OBJECTS=$($(subst $(CLASSPATH),$(BUILDS),$(CLASSES)):.java=.class)

17
makeWindows
View File

@ -9,7 +9,7 @@ JAVADOC_OPTIONS=-Xdoclint:all -private -encoding UTF-8 -charset UTF-8 -docencodi
BUILDS=builds
DOC=doc
CLASSPATH=src
LIBARIES=\
LIBRARIES=\
lib/jansi-1.16.jar
CLASSES=\
src/game/Main.java \
@ -18,8 +18,10 @@ src/game/GameHistory.java \
src/game/GameEntry.java \
src/game/PlayerObject.java \
src/player/Player.java \
src/player/Human.java \
src/player/malte/MalteAI.java \
src/player/malte/Pattern.java \
src/player/malte/Position.java \
src/player/malte/Sequence.java \
src/player/malte/Item.java \
src/player/maurizio/MaurizioAI.java
@ -30,15 +32,18 @@ BUILDFILES=$(OBJECTS) $(FXMLS_BUILD)
MAIN=game.Main
N=100
P1=
P2=
all: $(CLASSES) $(FXMLS_BUILD)
$(JAVAC) $(JAVAC_OPTIONS) -cp $(CLASSPATH);$(LIBARIES) $(CLASSES) -d $(BUILDS)
$(JAVAC) $(JAVAC_OPTIONS) -cp $(CLASSPATH);$(LIBRARIES) $(CLASSES) -d $(BUILDS)
run: $(CLASSES)
$(JAVA) -cp $(BUILDS);$(LIBARIES) $(MAIN)
$(JAVA) -cp $(BUILDS);$(LIBRARIES) $(MAIN) $(P1) $(P2)
simulate: $(CLASSES)
$(JAVA) -cp $(BUILDS);$(LIBARIES) $(MAIN) $(N)
$(JAVA) -cp $(BUILDS);$(LIBRARIES) $(MAIN) $(N)
doc: $(CLASSES)
$(JAVADOC) $(JAVADOC_OPTIONS) -cp $(CLASSPATH);$(LIBARIES) $(CLASSES) -d $(DOC)
@ -47,4 +52,4 @@ jar: all
$(JAR) -cfe VierGewinnt.jar $(MAIN) -C $(BUILDS) .
clean:
rm -rf $(BUILDS)/* $(DOC)/* VierGewinnt.jar
rm -rf $(BUILDS)\* $(DOC)\* VierGewinnt.jar