Mercurial > mxe-octave

changeset 6591:2dfe73c0c492

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* tools/makeinst-script.sh.in: add install system/software opengl option
author John Donoghue <john.donoghue@ieee.org>
date Sat, 31 Dec 2022 14:33:50 -0500
parents add737caf3a3
children 9eff743a7de0
files tools/makeinst-script.sh.in
diffstat 1 files changed, 22 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tools/makeinst-script.sh.in	Thu Dec 29 08:58:40 2022 -0500
+++ b/tools/makeinst-script.sh.in	Sat Dec 31 14:33:50 2022 -0500
@@ -375,6 +375,8 @@
 Var RegisterOctaveFileTypeCtrl
 Var InstallBlasLibCtrl
 Var InstallBlasLib
+Var InstallOpenGLCtrl
+Var InstallOpenGL
 
 Function octaveOptionsPage 
 
@@ -410,6 +412,12 @@
 
   \${NSD_CreateDropList} 100u 70u 100u 80u ""
   Pop \$InstallBlasLibCtrl
+
+  \${NSD_CreateLabel} 0 90u 110u 12u "OpenGL implementation:"
+  Pop \$0
+
+  \${NSD_CreateDropList} 100u 110u 100u 80u ""
+  Pop \$InstallOpenGLCtrl
 EOF
    # add option to install libopenblas if we have the dll present
    if [ -e $OCTAVE_SOURCE/$OCTAVE_SUBDIR/bin/libopenblas.dll ]; then
@@ -424,6 +432,11 @@
   cat >> $OUTFILE << EOF
   \${NSD_CB_SelectString} \$InstallBlasLibCtrl "$DEFAULT_BLAS"
 
+  ; add option for opengl
+  \${NSD_CB_AddString} \$InstallOpenGLCtrl "System OpenGL"
+  \${NSD_CB_AddString} \$InstallOpenGLCtrl "Software OpenGL"
+  \${NSD_CB_SelectString} \$InstallOpenGLCtrl "Software OpenGL"
+
   !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing"
   nsDialogs::Show  
   Pop \$0
@@ -433,6 +446,7 @@
   \${NSD_GetState} \$InstallShortcutsCtrl \$InstallShortcuts
   \${NSD_GetState} \$RegisterOctaveFileTypeCtrl \$RegisterOctaveFileType
   \${DropList_GetCurSel} \$InstallBlasLibCtrl \$InstallBlasLib
+  \${DropList_GetCurSel} \$InstallOpenGLCtrl \$InstallOpenGL
 FunctionEnd
 
 ######################################################################
@@ -567,6 +581,7 @@
   StrCpy \$InstallShortcuts \${BST_CHECKED}
   StrCpy \$RegisterOctaveFileType  \${BST_CHECKED}
   StrCpy \$InstallBlasLib 0
+  StrCpy \$InstallOpenGL 1
 
   ; process command line options
   \${GetParameters} \$R0
@@ -777,6 +792,13 @@
     CopyFiles /SILENT "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\libopenblas.dll" "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\libblas.dll"
   \${EndIf}
 
+  ; OpenGL set up
+  \${If} \$InstallOpenGL == 0
+    ; use system opengl - move opengl to backup
+    CopyFiles /SILENT "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\opengl32.dll" "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\opengl32.bak"
+    Delete "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\opengl32.dll" 
+  \${EndIf}
+ 
 SectionEnd
 
 Section "FileTypeRego"