diff --git a/src/main/scripts/startMZmine_Linux.sh b/src/main/scripts/startMZmine_Linux.sh index 1d8f9e7bd..4a652677d 100644 --- a/src/main/scripts/startMZmine_Linux.sh +++ b/src/main/scripts/startMZmine_Linux.sh @@ -60,13 +60,15 @@ mkdir $TMP_FILE_DIRECTORY # Java specific commands # ********************** -JAVA_PARAMETERS="-showversion -classpath lib/\* -XX:+UseG1GC -Djava.io.tmpdir=$TMP_FILE_DIRECTORY -Xms256m -Xmx${HEAP_SIZE}m" +JAVA_PARAMETERS="-showversion -classpath lib/\* -XX:+UseG1GC -Djava.io.tmpdir=$TMP_FILE_DIRECTORY -Djava.library.path=$TMP_FILE_DIRECTORY -Xms256m -Xmx${HEAP_SIZE}m" MAIN_CLASS=net.sf.mzmine.main.MZmineCore # Make sure we are in the correct directory SCRIPTDIR=`dirname "$0"` cd "$SCRIPTDIR" +export LD_LIBRARY_PATH="$TMP_FILE_DIRECTORY" + # This command starts the Java Virtual Machine echo "$JAVA_PARAMETERS" $MAIN_CLASS "$@" | xargs $JAVA_COMMAND diff --git a/src/main/scripts/startMZmine_MacOSX.command b/src/main/scripts/startMZmine_MacOSX.command index 93d536928..c7b964282 100755 --- a/src/main/scripts/startMZmine_MacOSX.command +++ b/src/main/scripts/startMZmine_MacOSX.command @@ -64,7 +64,7 @@ mkdir $TMP_FILE_DIRECTORY # Java specific commands # ********************** -JAVA_PARAMETERS="-showversion -classpath lib/\* -XX:+UseG1GC -Xdock:name='MZmine 2' -Xdock:icon=icons/MZmineIcon.png -Djava.io.tmpdir=$TMP_FILE_DIRECTORY -Dapple.laf.useScreenMenuBar=true -Xms256m -Xmx${HEAP_SIZE}m" +JAVA_PARAMETERS="-showversion -classpath lib/\* -XX:+UseG1GC -Xdock:name='MZmine 2' -Xdock:icon=icons/MZmineIcon.png -Djava.io.tmpdir=$TMP_FILE_DIRECTORY -Djava.library.path=$TMP_FILE_DIRECTORY -Dapple.laf.useScreenMenuBar=true -Xms256m -Xmx${HEAP_SIZE}m" MAIN_CLASS=net.sf.mzmine.main.MZmineCore # Make sure we are in the correct directory diff --git a/src/main/scripts/startMZmine_Windows.bat b/src/main/scripts/startMZmine_Windows.bat index c920503b5..be880ac94 100644 --- a/src/main/scripts/startMZmine_Windows.bat +++ b/src/main/scripts/startMZmine_Windows.bat @@ -93,7 +93,7 @@ echo. :: Java specific commands :: ********************** -set JAVA_PARAMETERS=-showversion -classpath lib\* -XX:+UseG1GC -Djava.io.tmpdir="%TMP_FILE_DIRECTORY%" -Xms256m -Xmx%HEAP_SIZE%m +set JAVA_PARAMETERS=-showversion -classpath lib\* -XX:+UseG1GC -Djava.io.tmpdir="%TMP_FILE_DIRECTORY%" -Djava.library.path="%TMP_FILE_DIRECTORY%" -Xms256m -Xmx%HEAP_SIZE%m set MAIN_CLASS=net.sf.mzmine.main.MZmineCore :: Make sure we are in the correct directory