From 8b391877d036fb94508a7a44792812672f3e8a5a Mon Sep 17 00:00:00 2001
From: Normen Hansen <normen667@gmail.com>
Date: Tue, 27 Jan 2015 18:32:07 +0100
Subject: [PATCH] - use "app" folder which is on java.library.path in native
 stub execution

---
 .../linux-x64/package.cfg                     |   2 +-
 .../linux-x86/package.cfg                     |   2 +-
 .../macosx-x64/Info.plist                     |   2 +-
 .../windows-x64/package.cfg                   |   2 +-
 .../windows-x86/package.cfg                   |   2 +-
 .../executables/desktop-deployment-data.zip   | Bin 424409 -> 424399 bytes
 .../desktop-deployment-targets.xml            |  10 +++++-----
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x64/package.cfg b/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x64/package.cfg
index 05e739377..e7a68dd19 100755
--- a/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x64/package.cfg
+++ b/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x64/package.cfg
@@ -2,5 +2,5 @@ app.mainjar=${jar.name}
 app.version=1.0
 app.preferences.id=${application.title}
 app.mainclass=${main.class}
-app.classpath=jni
+app.classpath=
 ${launcher.jvmargs}
diff --git a/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x86/package.cfg b/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x86/package.cfg
index 05e739377..e7a68dd19 100755
--- a/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x86/package.cfg
+++ b/sdk/jme3-desktop-executables/desktop-deployment-data/linux-x86/package.cfg
@@ -2,5 +2,5 @@ app.mainjar=${jar.name}
 app.version=1.0
 app.preferences.id=${application.title}
 app.mainclass=${main.class}
-app.classpath=jni
+app.classpath=
 ${launcher.jvmargs}
diff --git a/sdk/jme3-desktop-executables/desktop-deployment-data/macosx-x64/Info.plist b/sdk/jme3-desktop-executables/desktop-deployment-data/macosx-x64/Info.plist
index 35bf57d0d..005deef27 100644
--- a/sdk/jme3-desktop-executables/desktop-deployment-data/macosx-x64/Info.plist
+++ b/sdk/jme3-desktop-executables/desktop-deployment-data/macosx-x64/Info.plist
@@ -36,7 +36,7 @@
   <key>JVMMainClassName</key>
   <string>${main.class}</string>
   <key>JVMAppClasspath</key>
-  <string>jni</string>
+  <string></string>
   <key>JVMMainJarName</key>
   <string>${jar.name}</string>
   <key>JVMPreferencesID</key>
diff --git a/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x64/package.cfg b/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x64/package.cfg
index b9c6ca1f3..0384a0e59 100755
--- a/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x64/package.cfg
+++ b/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x64/package.cfg
@@ -3,5 +3,5 @@ app.version=1.0
 app.id=${application.title}
 app.preferences.id=${application.title}
 app.mainclass=${main.class}
-app.classpath=jni
+app.classpath=
 ${launcher.jvmargs}
diff --git a/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x86/package.cfg b/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x86/package.cfg
index b9c6ca1f3..0384a0e59 100755
--- a/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x86/package.cfg
+++ b/sdk/jme3-desktop-executables/desktop-deployment-data/windows-x86/package.cfg
@@ -3,5 +3,5 @@ app.version=1.0
 app.id=${application.title}
 app.preferences.id=${application.title}
 app.mainclass=${main.class}
-app.classpath=jni
+app.classpath=
 ${launcher.jvmargs}
diff --git a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/desktop-deployment-data.zip b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/desktop-deployment-data.zip
index a09bb71bdcf1d38c023e36167c0cd7afc17d201a..f47b5d82bc20e516598bc65b39d48458fed727be 100644
GIT binary patch
delta 1024
zcmcclS@Qg6$qCnmt0r5!1s1f4WH2x=^aHUdgUIxGWo%-T7+LB;d=LQ1fq-t0BVUUF
z5A*vy&BaIT7W8lQD&x#@o?5n3;h&#IjLvOI_N4)BFSxiLKlJK4^PJ&*`8KWDZT!Br
z;*a&Ev!8ewS-(r2)bUKfH1p-%yZ@7%*7n_*S5=XBS8R(a&*O<7uJ71zaaa0{^AouP
zyqQ_J7#KFUGTt`etw46*<Xj_#0e2Rk@f<DQa-g&Nk6(P%z{J2%H+g%k0%si?B$OI9
zKZw<0inU`|@nzYWEi3LCKi1r1wL(-XqJdGgd2Y|Ye2EE9weH`xJ|huUANstN_wJ_)
zCTW-UPQRRfVA`i+O*faT-ZtIybJ_YbqidqwrMzL?NtXkD9^?&QdqnoFZnyvIqxb)_
zH)kfaXC^QLF%u9o12N0?%mmiw-Ml40cQpkqs>=g9X4CZ8H>^tan;`CD011IWZLc9;
zvjLB5xk}!_oUQC9688mdmrzwJ3KF}r`+8$p>c)A0=cP<>l3c{C<Fng8DCJ)db4*T7
zXc%w#uDR@$6;CFpEZVtHP51BXq(3Riy)o+#|I=5y^2#^eYTA689ShDT$}F>exVA8D
zaq8&};r;spw!LNj9K>6M?5=4JYy<AB?Ta1QZkh6;r2pw%Wo#jgHPi2xvB}D#Bs^fS
ziGl+ULM&+vnJ!(<=ETT6J+2(679}+R(*dg5In!r>)Fw~ATh8XlSTS9`g3X4JVR}pj
zo3cDgd;tv?N3q3W`n(D@7sl_?A6Ec%E}X7f3DklTlo(nbPEW67b77w0z&3rq1DmK=
VfHx~RVG1z_G32u_FnE=MxB%GWe%1g0

delta 1122
zcmX^AS@Py*$qCna-*;NO{Ww{qoyEYwFlpiwh5AWA1_*!zKtQ+WAYZcqkMsK)_U9SD
z8|r$lrcPMJ8ydA^!QbCb50h@5D-O^W?NE!D;U69(^3V6fzl7{fnH86_pJe?>P42zp
zVb@nZQ+1KGOKeqL+4cQ1F3wV(zFhF#?G2)}yq>AE&iBMVKIQgOW5dyv_5t3^EL@u#
z8SfhKzD0J`<ZPn>ch+=+ayIeJ^2Y62W_=yjZq0J<Gn<$g7#i6a7(^LF7;+Pn^NTBV
zE6hyvJ@eA?^$Kz_i%S?81i%VFq1d$fPOKJF^1kpt0?Q`NF}kc&alU8yhgS<?G7=cs
zLU_uIe(kSxn6|nm|EocA#NW`l;$|jiobS)@{4VD|pE3HBG<VwkX*uQ}pUvJEbvhzy
z&2`fV-7a7Mr|i>Xwu+W-*{)-^w!HqoJSYUGuPbMhXs%CauTNkEVkRJF24a@&^$Dz}
zyLsOLLpERT-^2o-qqa^Df5WO&zZK*_AOH!0Ky9xf-ys7Y*Y93?UDLVwCLFF|b(U3C
zD{`9Nwfpgw4Vxm)*ZCV|EoHjM!hQPPWRceUpIOAEqbDzK(~dpYe8;BfgwVyi0n_Kz
zmzwU|ywNT1|KX4NX<MG1O|Y7_-e$+5^@=OcT;7zv$7Eg3lx<AaJ?|Kqw|{@b`XxyC
z6|&QS?ht1XnI2!sCQ%Ox$N_XDC&-n|;IOR)I%oS92e$pDs2OK^Lm69$Z5<;6Lr!L1
zDI_5jmy{+2cr!AIFmo|5aBwi7q-mh{L_uK<1xp&krVEy{IoYxs!;P>o(?>S~GwHz$
zU|?9%xM2DOpb^ZO2@I1P5=5uJDreJTteY-c!DhqAHa)0<O<55o@_|~#5!!+J-QKWH
zkA1@`F@0SHQ0M>YH!Ij28COo1u4Ge|$BY|<)+LQEr^i;ZxiBu8zNnH-oh_skm@60n
DylSOH

diff --git a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/desktop-deployment-targets.xml b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/desktop-deployment-targets.xml
index 5e116cd17..d62848e74 100644
--- a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/desktop-deployment-targets.xml
+++ b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/desktop-deployment-targets.xml
@@ -17,7 +17,7 @@
             <zipfileset file="resources/desktop-deployment/windows-x86/icon.ico" fullpath="${application.title}/${application.title}.ico"/>
             <zipfileset file="${dist.jar}" prefix="${application.title}/app"/>
             <zipfileset dir="${dist.dir}/lib" excludes="${deployment.jarexcludes}" prefix="${application.title}/app/lib"/>
-            <zipfileset dir="${build.dir}/natives/windows-x86" prefix="${application.title}/app/jni" erroronmissingdir="false"/>
+            <zipfileset dir="${build.dir}/natives/windows-x86" prefix="${application.title}/app" erroronmissingdir="false"/>
         </zip>
         <delete file="resources/desktop-deployment/windows-x86/_package.cfg"/>
         <antcall target="-package-windows-x86-jre"/>
@@ -52,7 +52,7 @@
             <zipfileset file="resources/desktop-deployment/windows-x64/icon.ico" fullpath="${application.title}/${application.title}.ico"/>
             <zipfileset file="${dist.jar}" prefix="${application.title}/app"/>
             <zipfileset dir="${dist.dir}/lib" excludes="${deployment.jarexcludes}" prefix="${application.title}/app/lib"/>
-            <zipfileset dir="${build.dir}/natives/windows-x64" prefix="${application.title}/app/jni" erroronmissingdir="false"/>
+            <zipfileset dir="${build.dir}/natives/windows-x64" prefix="${application.title}/app" erroronmissingdir="false"/>
         </zip>
         <delete file="resources/desktop-deployment/windows-x64/_package.cfg"/>
         <antcall target="-package-windows-x64-jre"/>
@@ -86,7 +86,7 @@
             <zipfileset file="resources/desktop-deployment/linux-x86/_package.cfg" fullpath="${application.title}/app/package.cfg"/>
             <zipfileset file="${dist.jar}" prefix="${application.title}/app"/>
             <zipfileset dir="${dist.dir}/lib" excludes="${deployment.jarexcludes}" prefix="${application.title}/app/lib"/>
-            <zipfileset dir="${build.dir}/natives/linux-x86" prefix="${application.title}/app/jni" erroronmissingdir="false"/>
+            <zipfileset dir="${build.dir}/natives/linux-x86" prefix="${application.title}/app" erroronmissingdir="false"/>
         </zip>
         <delete file="resources/desktop-deployment/linux-x86/_package.cfg"/>
         <antcall target="-package-linux-x86-jre"/>
@@ -121,7 +121,7 @@
             <zipfileset file="resources/desktop-deployment/linux-x64/_package.cfg" fullpath="${application.title}/app/package.cfg"/>
             <zipfileset file="${dist.jar}" prefix="${application.title}/app"/>
             <zipfileset dir="${dist.dir}/lib" excludes="${deployment.jarexcludes}" prefix="${application.title}/app/lib"/>
-            <zipfileset dir="${build.dir}/natives/linux-x64" prefix="${application.title}/app/jni" erroronmissingdir="false"/>
+            <zipfileset dir="${build.dir}/natives/linux-x64" prefix="${application.title}/app" erroronmissingdir="false"/>
         </zip>
         <delete file="resources/desktop-deployment/linux-x64/_package.cfg"/>
         <antcall target="-package-linux-x64-jre"/>
@@ -159,7 +159,7 @@
             <zipfileset file="resources/desktop-deployment/macosx-x64/icon.icns" fullpath="${application.title}.app/Contents/Resources/GenericApp.icns"/>
             <zipfileset file="${dist.jar}" prefix="${application.title}.app/Contents/Java"/>
             <zipfileset dir="${dist.dir}/lib" excludes="${deployment.jarexcludes}" prefix="${application.title}.app/Contents/Java/lib"/>
-            <zipfileset dir="${build.dir}/natives/macosx-x64" prefix="${application.title}.app/Contents/Java/jni" erroronmissingdir="false"/>
+            <zipfileset dir="${build.dir}/natives/macosx-x64" prefix="${application.title}.app/Contents/Java" erroronmissingdir="false"/>
         </zip>
         <delete file="resources/desktop-deployment/macosx-x64/_Info.plist"/>
         <antcall target="-package-macosx-x64-jre"/>