diff --git a/.gitignore b/.gitignore
index 7574165..cea4964 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-bin/
-00000.*
-META-INF/
-etc/config/
tmp/
+build/
+local.properties
+src/main/resources/APPLE2E.ROM
+src/main/resources/*.dsk
diff --git a/build.xml b/build.xml
index 30c094d..f2776c4 100644
--- a/build.xml
+++ b/build.xml
@@ -24,11 +24,7 @@
-
-
-
-
-
+
@@ -43,7 +39,6 @@
-
@@ -64,7 +59,10 @@
-->
-
+
+
+
+
@@ -72,23 +70,14 @@
-
-
-
-
-
-
-
+
-
-
-
-
+
@@ -100,11 +89,12 @@
+
-
+
@@ -112,30 +102,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
+
+
+
diff --git a/etc/config/settings.txt b/etc/config/settings.txt
deleted file mode 100644
index 42e42d9..0000000
--- a/etc/config/settings.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-#Mind that paths can not contain backslash
-#Make sure there are no spaces after the values
-
-console.font=Helvetica
-console.fontsize=10
-console.height=200
-console.show=true
-console.width=500
-console.x=0
-console.y=0
-extra.classpath=
-file.applications=config/applications.xml
-file.defaultbg=config/defaultbg.jpg
-file.settings=config/settings.txt
-font.sizeoffset=-2
-path.config=config
-remote.show=true
-safearea.color=#ffee00
-safearea.height=556
-safearea.show=true
-safearea.width=700
-safearea.x=10
-safearea.y=10
-tv.center=true
-tv.screenheight=576
-tv.screenwidth=720
-tv.x=0
-tv.y=0
diff --git a/local.properties.sample b/local.properties.sample
new file mode 100644
index 0000000..2b28aba
--- /dev/null
+++ b/local.properties.sample
@@ -0,0 +1,4 @@
+dir.bdj=yourdir/bdj-toolchain
+dir.sign=${dir.bdj}/common/sig
+dir.xletview=yourdir/xletview
+dir.runtime=${dir.xletview}/src/main/runtime
diff --git a/src/main/java/vavi/apps/appleii/AppleIIApp.java b/src/main/java/vavi/apps/appleii/AppleIIApp.java
index 1945e10..63324e9 100644
--- a/src/main/java/vavi/apps/appleii/AppleIIApp.java
+++ b/src/main/java/vavi/apps/appleii/AppleIIApp.java
@@ -335,6 +335,7 @@ try {
});
} catch (Throwable t) { // for xletview bug
t.printStackTrace(System.err);
+ System.err.println("this is running on xletview!");
files = new File[] {
new File(file, "Lode Runner.dsk"),
new File(file, "Mystery House.dsk"),
@@ -1192,8 +1193,8 @@ try {
private Properties props = new Properties();
MyDao() throws IOException {
- root = System.getProperty("bluray.vfs.root", "../tmp");
-//System.err.println("root: " + root);
+ root = System.getProperty("bluray.vfs.root", "");
+System.err.println("root: " + root);
props.load(new FileInputStream(new File(root, "appleii.properties")));
}
@@ -1236,6 +1237,7 @@ System.err.println("Illegal EOF: " + l + "/" + length);
}
} catch (IOException e) {
//e.printStackTrace(System.err);
+System.err.println("resource: " + resource);
throw new IllegalStateException(e);
}
}
diff --git a/src/main/resources/appleii.properties b/src/main/resources/appleii.properties
new file mode 100644
index 0000000..88a934a
--- /dev/null
+++ b/src/main/resources/appleii.properties
@@ -0,0 +1,11 @@
+cpuRom=APPLE2E.ROM
+displayColorMode=1
+displayScale=2
+#cpuDebugEnabled=true
+#displayStatMode=true
+cpuSpeed=2000
+displayRefreshRate=10
+#cpuStepMode=true
+#diskDrive1=Mystery House.dsk
+#diskDrive1=Tetris II.dsk
+diskDrive1=/LodeRunner.dsk