rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-30 19:52:13 +01:00
Code Issues Releases Activity

Merge pull request #2783 from ffissore/windows-glitch

Browse Source 
Attempt to fix glitches introduced by java8 on windows. Fixes #2761
This commit is contained in:
Federico Fissore 2015-03-19 10:21:21 +01:00
commit dcb65d9edd
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/windows/launcher/config.xml
View File

@ -33,6 +33,7 @@
<maxVersion></maxVersion>
<jdkPreference>preferJre</jdkPreference>
<opt>-splash:./lib/splash.png</opt>
<opt>-Dsun.java2d.d3d=false</opt>
</jre>
<messages>
<startupErr>An error occurred while starting the application.</startupErr>

3
build/windows/launcher/config_debug.xml
View File

@ -32,12 +32,13 @@
<minVersion>1.8.0</minVersion>
<maxVersion></maxVersion>
<jdkPreference>preferJre</jdkPreference>
<opt>-Dsun.java2d.d3d=false</opt>
</jre>
<messages>
<startupErr>An error occurred while starting the application.</startupErr>
<bundledJreErr>This application was configured to use a bundled Java Runtime Environment but the runtime is missing or corrupted.</bundledJreErr>
<jreVersionErr>This application requires at least Java Development Kit</jreVersionErr>
<launcherErr>The registry refers to a nonexistent Java Development Kit installation or the runtime is corrupted.</launcherErr>
<launcherErr>The registry refers to a nonexistent Java Development Kit installation or the runtime is corrupted.</launcherErr>
<instanceAlreadyExistsMsg>An application instance is already running.</instanceAlreadyExistsMsg>
</messages>
</launch4jConfig>