From c4ffdfe68cb518bf6f45ef23368fa2ae3414f496 Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Sun, 20 Sep 2015 11:07:56 -0400
Subject: [PATCH] debugging and forcing use of the local version of jna for
 #3800 and #3624

---
 build/build.xml              |  2 +-
 build/windows/config-cmd.xml |  2 +-
 build/windows/config.xml     | 13 +++++++++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 74e3a4c9f..319591914 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1036,7 +1036,7 @@
       <equals arg1="${sun.arch.data.model}" arg2="64" />
     </condition>
 
-    <unzip src="../app/lib/jna.jar" dest="windows/work">
+    <unzip src="../app/lib/jna.jar" dest="windows/work/lib">
       <patternset>
         <include name="com/sun/jna/${jna.subfolder}/jnidispatch.dll" />
       </patternset>
diff --git a/build/windows/config-cmd.xml b/build/windows/config-cmd.xml
index 647082bfc..da256fb38 100644
--- a/build/windows/config-cmd.xml
+++ b/build/windows/config-cmd.xml
@@ -33,7 +33,7 @@
          https://github.com/processing/processing/issues/2239 -->
     <opt>-Djna.nosys=true</opt>
     <!-- starting in 3.0, require Java 8 -->
-    <minVersion>1.8.0</minVersion>
+    <minVersion>1.8.0_51</minVersion>
     <!-- increase available per PDE X request -->
     <maxHeapSize>256</maxHeapSize>
   </jre>
diff --git a/build/windows/config.xml b/build/windows/config.xml
index 46e8982d1..90c290121 100644
--- a/build/windows/config.xml
+++ b/build/windows/config.xml
@@ -32,8 +32,17 @@
     <path>java</path>
     <!-- https://github.com/processing/processing/issues/2239 -->
     <opt>-Djna.nosys=true</opt>
-    <!-- for 2.2, set a minimum version -->
-    <minVersion>1.7.0_40</minVersion>
+    <!-- Because nosys is set to true, the DLL in the current working 
+	 directory won't be considered. And we can't specify the user's 
+	 directory here because that'll get us into encoding trouble.
+	 (See https://github.com/processing/processing/issues/3624)
+	 Instead, set this so that Native.loadNativeLibrary() will use
+	 new File(path, "jnidispatch.dll") which will be relative to the
+	 directory of processing.exe (the current working directory). -->
+    <opt>-Djna.boot.library.path=lib</opt>
+    <opt>-Djna.nounpack=true</opt>
+    <!-- starting in 3.0, require Java 8 -->
+    <minVersion>1.8.0_51</minVersion>
     <!-- increase available per PDE X request -->
     <maxHeapSize>256</maxHeapSize>
   </jre>