merging conflicts
This commit is contained in:
commit
f2fd55ec47
18
makeWindows
18
makeWindows
|
@ -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,9 +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/Item.java \
|
||||
src/player/malte/Position.java \
|
||||
src/player/malte/Sequence.java \
|
||||
src/player/maurizio/MaurizioAI.java
|
||||
|
||||
OBJECTS=$($(subst $(CLASSPATH),$(BUILDS),$(CLASSES)):.java=.class)
|
||||
|
@ -30,15 +31,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 +51,4 @@ jar: all
|
|||
$(JAR) -cfe VierGewinnt.jar $(MAIN) -C $(BUILDS) .
|
||||
|
||||
clean:
|
||||
rm -rf $(BUILDS)/* $(DOC)/* VierGewinnt.jar
|
||||
rm -rf $(BUILDS)\* $(DOC)\* VierGewinnt.jar
|
||||
|
|
Loading…
Reference in a new issue