From 2daafe71cffc14110bd2ec1ebcf0ecc1e7bdcc7c Mon Sep 17 00:00:00 2001
From: "nor..67" <normen667@gmail.com>
Date: Sun, 21 Oct 2012 23:00:09 +0000
Subject: [PATCH] SDK: - add fix for desktop creation failing when no JVM
 options are set

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9876 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
---
 .../DesktopExeCompositeProvider.java          |   2 +-
 .../gde/desktop/executables/winapp-data.zip   | Bin 56237 -> 56247 bytes
 .../winapp-data/winapp-config.xml             |   4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/DesktopExeCompositeProvider.java b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/DesktopExeCompositeProvider.java
index 4efaa5c29..7cdc2437d 100644
--- a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/DesktopExeCompositeProvider.java
+++ b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/DesktopExeCompositeProvider.java
@@ -62,7 +62,7 @@ public class DesktopExeCompositeProvider implements ProjectCustomizer.CompositeC
         public SavePropsListener(ProjectExtensionProperties props, Project project) {
             this.properties = props;
             this.project = project;
-            launch4j = new ProjectExtensionManager("launch4j", "v1.3", new String[]{"jar", "-launch4j-exe"});
+            launch4j = new ProjectExtensionManager("launch4j", "v1.4", new String[]{"jar", "-launch4j-exe"});
             launch4j.setAntTaskLibrary("launch4j");
             launch4j.setDataZip("nbres:/com/jme3/gde/desktop/executables/winapp-data.zip");
             macapp = new ProjectExtensionManager("macapp", "v1.2", new String[]{"jar", "-mac-app"});
diff --git a/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/winapp-data.zip b/sdk/jme3-desktop-executables/src/com/jme3/gde/desktop/executables/winapp-data.zip
index e90b502030029e03c2224019ab39f33cdc8e936a..a300dba3a18314fd8680b062e8a10929261cd2a2 100644
GIT binary patch
delta 716
zcmV;-0yF)sw*$Ag1F&(}4Mqo6L2GIvl#&7f02Y&e*cyM!Zk#X_hW9*$JIb=)L~5%p
z9I|LLQnIL`c6yPjE*x_JM_?n{Br{6p-Fs}qaA{N_A^6W{^Ph`hSNpahk6^6S>T+|D
zoo@&zp$n<1%gy)QHvPD{$`ke`O_QA_qUNds;%aG$gSKn9gSV(^ZGr5xZY+5ryCGl`
zt_q?%P`G~pPCSwE9SZ5R$&xh9lY}+ASE7FR@JXvuR(V1QtAQ6_c83n~s+Ww;-hEj2
zu9OYrXU~PSE-R!t(z9pYb&V9<VLF+Uu7P6)dth{={mKV!##Q)uWYh~j0LJY6n*6nW
z7(InOD}`3M0jql>z|zq_eUd8mu?%mF2Fl~2MuUHO#%O#9Qg5AZ?~E2-cni5RJ^EaU
zp0n7C25yvfT!|o|*!B+g0Xchaxm1~GxV30<3Pce76#D6ZY0U}$J-YfJ2{kk0hByl3
zTL(gx2ci`aU50j+x@k0SRS|8-y>>P6jU88X+|~JguZji=a{Kj~c!5!WKVhv@KjI+f
z7ukRN>>P8Ml!)lgVG^cS*~4SYO=XWH{iQUoKsoF&MneLFS^r^+GiU2zd6)oyV{{w_
zUm-5tR-2!p451A#C2uT3%Sfc1YypQUw}7oJEcyN6{12m}x?rx2S!_3xW1WMyn7{Wr
z9K#z`>Y3rO0{bjn(fYD1Ztu1;5eERPu@Zl$4L^ewMs{vO*J@;i?hZy)wHv7EJ;pnu
zi(a^Y{H^qp#k-|`a(VX}KWq|DMj+?PXt3?LI?R~45*eu+7{!|)`8*Xq;JKX3!)#%0
z5~b|`o#^2QvJQt9&RRD0u?1^!B<-*<9wX!WE=)skITIo=9E@876SUMKhjTqtY2p)>
yTIAx-2+Tyym0*1I=v_0q`umd{+ei&Y2UbCAY9f@90ssIOlX2TN1}NJA0002Azf=YQ

delta 706
zcmV;z0zLh=w*#%W1F&(}4K8*<L5}L3aEJl`00)zP*cyLLZ=5g?hVT3eceTeZPNcT#
z!6An>D<y|2YPad3>cKGsI5Hk&n`Bo>{(Joa3v8nb3Bfy$hj(Ud*yX-e<PnUOs4rIM
z`Pqtq7FbGMU#x!awwuqZ%OYd%Hk)jRL^NF2KwKj&anN>(J9zI^L<?kxs4RIQyCGmR
zu1kU)Xup2|jy#d+9ZKoY<k@CZWEoSu*P{9G@C9`x>mnnBHNZ<SyF&*>-AhJi?;(u6
ztE7Tr{ai}x@=}^tx_;(er=;M{my<i`6ujoJ2S!IatbE{RT;(5M84W@RfHAwUrg$q4
zqsMSyr9fR6u-F>`mX7}Elhm6K%l(bfNCjLp-e7-`GnyWv)LVz`twHgPw@^6Kd!Hv_
z;H;m8f@^IZ*CI+@Y<ma$h^(JmE_E&xx7M4S0txhfN__fXS#u(MkDh#x#GaWkq2CJR
zM+ZVy2Z9<1R&ksaDuq5(P0)~gbPWlEjVn6tn&Q6KrGk>&e7_<=U^L1@HB#TDJy@LQ
zAM<}RU&f>)1Uu*bn_lM+k1aQKs5NNO@!&3avwoA=F>f4sxG_3TKeU8Pw?*?S)*bu)
zQgLNHw2UO$$rk+XDJ=L|mX`efboPhQQC%=s#w^m!<kZ;cE%haM9nRggu5e~}tb3ow
zD_LJQ!|mO6Ci;mx|Fxw!CHx9j7}>cAJym}bE3i8lSvPK=ruSiv2FqT!fBc>3M~k;h
z{pj-cEq+LnjzT2o%4o3dxIWC7xsn*E9T?43ltP`_Klp<<mxmqYYm;8u4$zSv{urm>
zIKtV;ra87?Ew8~2iT$}TuJ7V*h%RSBB8J0oV_<@oTH^e^9=bGfOD%Ef?*nF{=1K`P
oK6(tU89n*klP23p4K8*<L5}L3aEJl`00)zM+cpLs+W-In0K?f<n*aa+

diff --git a/sdk/jme3-desktop-executables/winapp-data/winapp-config.xml b/sdk/jme3-desktop-executables/winapp-data/winapp-config.xml
index 80a80554e..d0d0ff1de 100644
--- a/sdk/jme3-desktop-executables/winapp-data/winapp-config.xml
+++ b/sdk/jme3-desktop-executables/winapp-data/winapp-config.xml
@@ -18,9 +18,9 @@ and open the template in the editor.
   </singleInstance> 
   <jre>
     <!-- Specify one of the following or both -->
-    <path>bundled JRE path</path>
+    <!--path>bundled JRE path</path-->
     <minVersion>1.5.0</minVersion>
-    <opt>${run.jvmargs}</opt>
+    <opt>${run.jvmargs} -Xnoagent</opt>
   </jre>
   <!--splash>
     <file>file</file>