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

merging conflicts

Browse source
This commit is contained in:
MaurizioBruetsch 2017-10-27 18:01:50 +02:00
parent 352f991005 87725b969b
commit f2fd55ec47
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
makeWindows
View file

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