Mercurial > mxe-octave

comparison installer-files/octave.vbs @ 4222:44b1a9b2193e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt5: add initial qt5 to mxe-octave, based on mxe.cc * src/qt5.mk: new file * src/qtbase-1-fixes.patch: new file * src/qtbase.mk: new file * src/qtimageformats-1.patch: new file * src/qtimageformats.mk: new file * src/qtsvg.mk: new file * src/qttools-1.patch: new file * added src/qttools.mk: new file * changed Makefile.in: added ENABLE_QT5 option * configure.ac: added enable-qt5 option * index.html: added new files to packages * installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path * installer-files/octave.vbs: added setup of qt5 bin, plugin path * installer-files/octave.bat: added setup of qt5 bin path * src/default-octave.mk: added settig fot qt5 usage * src/qscintilla.mk: added qt5 path
author John D
date Thu, 29 Sep 2016 11:22:51 -0400
parents cc549d1865cb
children a45374f7d9a3
comparison
equal deleted inserted replaced
4221:1cac12604314 4222:44b1a9b2193e
15 wshSystemEnv("TERM") = "cygwin" 15 wshSystemEnv("TERM") = "cygwin"
16 wshSystemEnv("GNUTERM") = "windows" 16 wshSystemEnv("GNUTERM") = "windows"
17 17
18 wshSystemEnv("GS") = "gs.exe" 18 wshSystemEnv("GS") = "gs.exe"
19 19
20 ' set Qt plugin directory 20 ' set Qt plugin directory and path
21 wshSystemEnv("QT_PLUGIN_PATH") = OctavePath & "\plugins" 21 Set objFSO = CreateObject("Scripting.FileSystemObject")
22 If objFSO.FolderExists(OctavePath & "\qt5\bin") Then
23 wshSystemEnv("PATH") = OctavePath & "\qt5\bin;" & wshSystemEnv("PATH")
24 wshSystemEnv("QT_PLUGIN_PATH") = OctavePath & "\qt5\plugins"
25 Else
26 wshSystemEnv("QT_PLUGIN_PATH") = OctavePath & "\plugins"
27 End If
22 28
23 ' check args to see if told to run gui or command line 29 ' check args to see if told to run gui or command line
24 ' and build other args to use 30 ' and build other args to use
25 GUI_MODE=1 31 GUI_MODE=1
26 AllArgs = "" 32 AllArgs = ""