From 2bec75020511013ebdf2bf439398bc2333363a5f Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Sat, 9 Jun 2018 11:14:48 +0100 Subject: [PATCH] Removed -d64 and -d32 from Mac launch scripts. These were previously deprecated and now removed in Java 10. The 32/64-bit scripts are now identical, but kept separate for now in case of later changes. --- prism/src/bin/prism.darwin32 | 2 +- prism/src/bin/prism.darwin64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/prism/src/bin/prism.darwin32 b/prism/src/bin/prism.darwin32 index c29b58db..afa71aff 100755 --- a/prism/src/bin/prism.darwin32 +++ b/prism/src/bin/prism.darwin32 @@ -92,7 +92,7 @@ if [ "$PRISM_DEBUG" != "" ]; then fi # Run PRISM through Java -"$PRISM_JAVA" $PRISM_JAVA_ARG1 $PRISM_JAVA_ARG2 -d32 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $PRISM_JAVASTACKSIZE "$PRISM_ICON" "$PRISM_DOCK_NAME" -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH" -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@" +"$PRISM_JAVA" $PRISM_JAVA_ARG1 $PRISM_JAVA_ARG2 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $PRISM_JAVASTACKSIZE "$PRISM_ICON" "$PRISM_DOCK_NAME" -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH" -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@" PRISM_EXIT_CODE=$? diff --git a/prism/src/bin/prism.darwin64 b/prism/src/bin/prism.darwin64 index dd1e73b0..afa71aff 100755 --- a/prism/src/bin/prism.darwin64 +++ b/prism/src/bin/prism.darwin64 @@ -92,7 +92,7 @@ if [ "$PRISM_DEBUG" != "" ]; then fi # Run PRISM through Java -"$PRISM_JAVA" $PRISM_JAVA_ARG1 $PRISM_JAVA_ARG2 -d64 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $PRISM_JAVASTACKSIZE "$PRISM_ICON" "$PRISM_DOCK_NAME" -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH" -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@" +"$PRISM_JAVA" $PRISM_JAVA_ARG1 $PRISM_JAVA_ARG2 $PRISM_JAVA_DEBUG $PRISM_JAVAMAXMEM $PRISM_JAVASTACKSIZE "$PRISM_ICON" "$PRISM_DOCK_NAME" -Djava.awt.headless=$PRISM_HEADLESS -Djava.library.path="$JAVA_LIBRARY_PATH" -classpath "$PRISM_CLASSPATH" $PRISM_MAINCLASS "$@" PRISM_EXIT_CODE=$?