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

post merge problems

Browse source
This commit is contained in:
Maurizio Bruetsch 2017-10-23 14:54:01 +02:00
parent d9d4f50e74
commit b543da5964
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -37,7 +37,6 @@ P2=
all: $(CLASSES) $(FXMLS_BUILD) all: $(CLASSES) $(FXMLS_BUILD)
<<<<<<< HEAD
$(JAVAC) $(JAVAC_OPTIONS) -cp $(CLASSPATH):$(LIBRARIES) $(CLASSES) -d $(BUILDS) $(JAVAC) $(JAVAC_OPTIONS) -cp $(CLASSPATH):$(LIBRARIES) $(CLASSES) -d $(BUILDS)
run: $(CLASSES) run: $(CLASSES)
@ -45,15 +44,6 @@ run: $(CLASSES)
simulate: $(CLASSES) simulate: $(CLASSES)
$(JAVA) -cp $(BUILDS):$(LIBRARIES) $(MAIN) $(N) $(JAVA) -cp $(BUILDS):$(LIBRARIES) $(MAIN) $(N)
=======
$(JAVAC) $(JAVAC_OPTIONS) -cp $(CLASSPATH):$(LIBARIES) $(CLASSES) -d $(BUILDS)
run: $(CLASSES)
$(JAVA) -cp $(BUILDS):$(LIBARIES) $(MAIN) $(P1) $(P2)
simulate: $(CLASSES)
$(JAVA) -cp $(BUILDS):$(LIBARIES) $(MAIN) $(N)
>>>>>>> master
doc: $(CLASSES) doc: $(CLASSES)
$(JAVADOC) $(JAVADOC_OPTIONS) -cp $(CLASSPATH):$(LIBARIES) $(CLASSES) -d $(DOC) $(JAVADOC) $(JAVADOC_OPTIONS) -cp $(CLASSPATH):$(LIBARIES) $(CLASSES) -d $(DOC)