diff --git a/.gitignore b/.gitignore index aef4721..9421102 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,6 @@ .mtj.tmp/ # Packaged Java components -*.jar *.war *.ear diff --git a/AppleCommander-ac-1.4.0.jar b/AppleCommander-ac-1.4.0.jar new file mode 100644 index 0000000..4d61bfc Binary files /dev/null and b/AppleCommander-ac-1.4.0.jar differ diff --git a/Makefile b/Makefile index a65a529..6e3a35f 100644 --- a/Makefile +++ b/Makefile @@ -6,13 +6,13 @@ ifeq ($(OS),Windows_NT) MERLIN=$(MERLIN_DIR)/Windows/Merlin32 RM=del /s else - MERLIN_DIR=/opt/Merlin32_v1.0 + MERLIN_DIR=$(HOME)/opt/Merlin32_v1.0 MERLIN_LIB=$(MERLIN_DIR)/Library - MERLIN=$(MERLIN_DIR)/Windows/Merlin32 + MERLIN=$(MERLIN_DIR)/Linux64/Merlin32 RM=rm -f endif -AC=java -jar AppleCommander-1.3.5.14.jar +AC=java -jar AppleCommander-*.jar SRC=online.s PGM=ONLINE VOL=$(PGM)