diff --git a/processing/build/windows/dist/run-expert.bat b/processing/build/windows/dist/run-expert.bat index 739f27d41..6f2008041 100755 --- a/processing/build/windows/dist/run-expert.bat +++ b/processing/build/windows/dist/run-expert.bat @@ -1,11 +1,11 @@ @echo off -REM --- if you need more ram, change the 64m (which means -REM --- 64 megabytes) to something higher. +REM --- if you're running out of memory, change the 128m +REM --- (which means 128 megabytes) to something higher. set SAVEDCP=%CLASSPATH% -set CLASSPATH=%CLASSPATH%;java\lib\rt.jar;lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\antlr.jar;lib\oro.jar;lib\comm.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip +set CLASSPATH=%CLASSPATH%;lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\antlr.jar;lib\oro.jar;lib\comm.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip -start javaw -ms64m -mx64m PdeBase +start javaw -ms128m -mx128m PdeBase set CLASSPATH=%SAVEDCP% diff --git a/processing/build/windows/dist/run.bat b/processing/build/windows/dist/run.bat index a0e0edde4..ca16d9d3a 100755 --- a/processing/build/windows/dist/run.bat +++ b/processing/build/windows/dist/run.bat @@ -1,11 +1,11 @@ @echo off -REM --- if you need more ram, change the 64m (which means -REM --- 64 megabytes) to something higher. +REM --- if you're running out of memory, change the 128m +REM --- (which means 128 megabytes) to something higher. set SAVEDCP=%CLASSPATH% -set CLASSPATH=%CLASSPATH%;java\lib\rt.jar;lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\antlr.jar;lib\oro.jar;lib\comm.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip +set CLASSPATH=%CLASSPATH%;java\lib\rt.jar;java\lib\jaws.jar;lib;lib\build;lib\pde.jar;lib\kjc.jar;lib\antlr.jar;lib\oro.jar;lib\comm.jar;%windir%\system32\qtjava.zip;%windir%\system\qtjava.zip -start .\java\bin\javaw -ms64m -mx64m PdeBase +start .\java\bin\javaw -ms128m -mx128m PdeBase set CLASSPATH=%SAVEDCP% diff --git a/processing/build/windows/launcher/launcher.cpp b/processing/build/windows/launcher/launcher.cpp index 321821d8b..37e38f1ef 100644 --- a/processing/build/windows/launcher/launcher.cpp +++ b/processing/build/windows/launcher/launcher.cpp @@ -182,7 +182,7 @@ WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmd, int nShow) //, // the first three %s args - local_jre_installed ? "java\\lib\\rt.jar;" : "", + local_jre_installed ? "java\\lib\\rt.jar;java\\lib\\jaws.jar;" : "", qtjava_path, env_classpath, diff --git a/processing/build/windows/launcher/processing.exe b/processing/build/windows/launcher/processing.exe index 88e358e3b..8a3c8199a 100755 Binary files a/processing/build/windows/launcher/processing.exe and b/processing/build/windows/launcher/processing.exe differ diff --git a/processing/build/windows/run.sh b/processing/build/windows/run.sh index 0b25f688b..aaf20aba5 100644 --- a/processing/build/windows/run.sh +++ b/processing/build/windows/run.sh @@ -27,6 +27,6 @@ fi # version for javac/1.1 testing #CLASSPATH=java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\oro.jar\;java\\lib\\ext\\comm.jar\;${QT_JAVA_PATH}\;..\\..\\macos9\\JDKClasses.zip\;..\\..\\macos9\\JDKToolsClasses.zip -CLASSPATH=\"java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\comm.jar\;lib\\RXTXcomm.jar\;${QT_JAVA_PATH}\" +CLASSPATH=\"java\\lib\\rt.jar\;java\\lib\\jaws.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\comm.jar\;lib\\RXTXcomm.jar\;${QT_JAVA_PATH}\" cd work && ./java/bin/java PdeBase diff --git a/processing/build/windows/srun.sh b/processing/build/windows/srun.sh index d81943ba9..2ea7b59ee 100755 --- a/processing/build/windows/srun.sh +++ b/processing/build/windows/srun.sh @@ -18,7 +18,7 @@ else fi fi -CLASSPATH=\"java\\lib\\rt.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\comm.jar\;lib\\RXTXcomm.jar\;${QT_JAVA_PATH}\" +CLASSPATH=\"java\\lib\\rt.jar\;java\\lib\\jaws.jar\;lib\;lib\\build\;lib\\pde.jar\;lib\\kjc.jar\;lib\\antlr.jar\;lib\\oro.jar\;lib\\comm.jar\;lib\\RXTXcomm.jar\;${QT_JAVA_PATH}\" export CLASSPATH