mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Win installer: update Qt
- Qt 5.6.3 uses a different path name scheme - one DLL was removed in Qt 5.6.3
This commit is contained in:
parent
d7306b62ac
commit
1940a1f080
@ -1,9 +1,11 @@
|
||||
Changelog for LyX-230-beta1:
|
||||
- installs LyX 2.3.0 beta1
|
||||
- updated to MiKTeX 2.9 build 6361
|
||||
- updated to Qt 5.6.3
|
||||
- updated to ImageMagick 7.0.6-7
|
||||
- updated to Perl 5.24.2.1
|
||||
- updated to NSIS 3.0.2.1
|
||||
- updated to Ghostscript 9.22
|
||||
- updated thesaurus for Ukrainian
|
||||
- updated spell checker dictionaries for English (GB), Portuguese, Scottish and
|
||||
Ukrainian
|
||||
|
@ -28,7 +28,6 @@ Lists of files to include in the installer
|
||||
|
||||
!macro FileListQtImageformats COMMAND DIRECTORY
|
||||
|
||||
${FILE}qdds.dll"
|
||||
${FILE}qgif.dll"
|
||||
${FILE}qicns.dll"
|
||||
${FILE}qico.dll"
|
||||
@ -57,9 +56,6 @@ Lists of files to include in the installer
|
||||
|
||||
!macro FileListMSVC COMMAND DIRECTORY
|
||||
|
||||
# Files needed for MSVC 2010
|
||||
${FILE}msvcr100.dll"
|
||||
${FILE}msvcp100.dll"
|
||||
# Files needed for MSVC 2015
|
||||
${FILE}concrt140.dll"
|
||||
${FILE}msvcp140.dll"
|
||||
|
@ -41,7 +41,7 @@ These typically need to be modified for each LyX release
|
||||
|
||||
!define FILES_LYX "D:\LyXPackage2.3\LyX"
|
||||
!define FILES_DEPS "D:\LyXGit\Master\lyx-windows-deps-msvc2015"
|
||||
!define FILES_QT "C:\Qt\Qt5.6.2-MSVC-2015\5.6\msvc2015"
|
||||
!define FILES_QT "C:\Qt\Qt5.6.3\5.6.3\msvc2015"
|
||||
!define ClassFileDir "${FILES_LYX}\Resources\tex"
|
||||
!define DVIPostFileDir "${FILES_DEPS}\tex"
|
||||
|
||||
|
@ -5,7 +5,7 @@ REM Create a link and add cmd.exe /k in the preferences in front of the mingw.
|
||||
::echo off
|
||||
|
||||
REM Install Qt from qt.io
|
||||
set PATH=C:\Qt\Qt5.6.2-MSVC2015\5.6\msvc2015\bin;%PATH%
|
||||
set PATH=C:\Qt\Qt5.6.3\5.6.3\msvc2015\bin;%PATH%
|
||||
|
||||
set LYX_SOURCE=%~DP0..\..
|
||||
set LYX_BUILD=%LYX_SOURCE%\..\build-result-5-2015
|
||||
|
@ -33,7 +33,7 @@ REM Save path
|
||||
set CALLED_FROM=%CD%
|
||||
|
||||
REM Add path to qmake here or set PATH correctly on your system.
|
||||
set PATH=C:\Qt\Qt5.6.1-MSVC2015-x64\5.6\msvc2015_64\bin;%PATH%
|
||||
set PATH=C:\Qt\Qt5.6.3\5.6.3\msvc2015_64\bin;%PATH%
|
||||
|
||||
REM Edit pathes here or set the environment variables on your system.
|
||||
set GNUWIN32_DIR=D:\LyXGit\Master\lyx-windows-deps-msvc2015-x64
|
||||
|
@ -34,7 +34,7 @@ set CALLED_FROM=%CD%
|
||||
|
||||
REM Edit pathes here or set the environment variables on your system.
|
||||
set CMAKE_PATH="C:\Program Files\CMake\bin"
|
||||
set QT_PATH="C:\Qt\Qt5.6.2-MSVC-2015\5.6\msvc2015\bin"
|
||||
set QT_PATH="C:\Qt\Qt5.6.3\5.6.3\msvc2015\bin"
|
||||
set GNUWIN32_DIR="D:\LyXGit\Master\lyx-windows-deps-msvc2015"
|
||||
set LYX_SOURCE="D:\LyXGit\2.3.x"
|
||||
set LYX_BUILD="D:\LyXGit\2.3.x\compile-2015"
|
||||
|
Loading…
Reference in New Issue
Block a user