From 3bbcfb5e6bd1a8936356a9bb015667048fe5fa86 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Fri, 12 Sep 2014 14:31:07 +0200
Subject: [PATCH 1/2] Resolved possible jnidispatch.dll conflict on Windows

from: https://github.com/processing/processing/issues/2239

  If there's is some other Java program installed that uses JNA and
  jnidispatch.dll happens to be in the path then JNA in Processing
  will try to load it and probably crash due to some version mismatch.

  The issue can easily be solved by setting jna.nosys to make sure JNA
  will always extract the correct native lib from it's jar and ignore
  any libs in the system path:

    -Djna.nosys=true

Fix #1948
---
 build/windows/launcher/config.xml       | 2 +-
 build/windows/launcher/config_debug.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/windows/launcher/config.xml b/build/windows/launcher/config.xml
index 3f427d04033..fab33cab347 100644
--- a/build/windows/launcher/config.xml
+++ b/build/windows/launcher/config.xml
@@ -32,7 +32,7 @@
     <minVersion>1.6.0</minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
-    <opt>-Xms128m -Xmx128m</opt>
+    <opt>-Djna.nosys=true -Xms128m -Xmx128m</opt>
   </jre>
   <splash>
     <file>about.bmp</file>
diff --git a/build/windows/launcher/config_debug.xml b/build/windows/launcher/config_debug.xml
index 8af63a463b4..5b30a5118d6 100644
--- a/build/windows/launcher/config_debug.xml
+++ b/build/windows/launcher/config_debug.xml
@@ -32,7 +32,7 @@
     <minVersion>1.6.0</minVersion>
     <maxVersion></maxVersion>
     <jdkPreference>preferJre</jdkPreference>
-    <opt>-Xms128m -Xmx128m</opt>
+    <opt>-Djna.nosys=true -Xms128m -Xmx128m</opt>
   </jre>
   <messages>
     <startupErr>An error occurred while starting the application.</startupErr>

From 5d97e0d40e2c7463e7701103287f05e70a5f4549 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Sat, 17 Jan 2015 20:53:35 +0100
Subject: [PATCH 2/2] Upgraded launch4j to version 3.6

---
 build/build.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 6528e5cc986..499ea425a3d 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -666,16 +666,16 @@
   </target>
 
   <target name="download-launch4j-windows">
-    <get src="http://switch.dl.sourceforge.net/project/launch4j/launch4j-3/3.0.2/launch4j-3.0.2-win32.zip" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" />
-    <unzip dest="windows/launcher/" src="windows/launch4j-3.0.2-win32.zip" overwrite="true"/>
+    <get src="http://switch.dl.sourceforge.net/project/launch4j/launch4j-3/3.6/launch4j-3.6-win32.zip" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" />
+    <unzip dest="windows/launcher/" src="windows/launch4j-3.6-win32.zip" overwrite="true"/>
   </target>
 
   <target name="download-launch4j-linux">
-    <get src="http://switch.dl.sourceforge.net/project/launch4j/launch4j-3/3.0.2/launch4j-3.0.2-linux.tgz" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" />
+    <get src="http://switch.dl.sourceforge.net/project/launch4j/launch4j-3/3.6/launch4j-3.6-linux.tgz" dest="windows" usetimestamp="true" skipexisting="true" verbose="true" />
 
     <exec executable="tar" dir="windows/launcher">
       <arg value="-xf"/>
-      <arg value="../launch4j-3.0.2-linux.tgz"/>
+      <arg value="../launch4j-3.6-linux.tgz"/>
     </exec>
   </target>