Mercurial > mxe-octave

changeset 4613:4d39ccb64c08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nsis installer: remove jump into reg64 mode when compiled for win64 * tools/makeinst-script.sh.in: remove if ENABLE64 blocks in java detect
author John D
date Mon, 05 Mar 2018 09:05:05 -0500
parents 56320dd51677
children 5e4c8c571527
files tools/makeinst-script.sh.in
diffstat 1 files changed, 0 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/tools/makeinst-script.sh.in	Sat Mar 03 19:42:43 2018 -0500
+++ b/tools/makeinst-script.sh.in	Mon Mar 05 09:05:05 2018 -0500
@@ -642,10 +642,6 @@
 ;  1 - JAVA_HOME environment variable
 ;  2 - the registry
 EOF
-  # use 64 bit reg to look for java
-  if [ "$ENABLE64" == "yes" ]; then
-    echo "SetRegView 64" >> $OUTFILE
-  fi
   cat >> $OUTFILE << EOF
 
   Push \$R0
@@ -675,10 +671,6 @@
   Pop \$R1
   Pop \$R0
 EOF
-  # put reg back to 32 (our version of nsis is a 32 bit app)
-  if [ "$ENABLE64" == "yes" ]; then
-    echo "SetRegView 32" >> $OUTFILE
-  fi
   cat >> $OUTFILE << EOF
 
 FunctionEnd