anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Win installer: we need to ship the Qt platform dlls

Browse Source 
- also remove now unnecessary file lists
This commit is contained in:
Uwe Stöhr 2016-01-14 22:56:49 +01:00
parent 3ac456f444
commit 063b7ff849
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
development/Win32/packaging/installer/include/filelist.nsh
View File

@ -49,6 +49,14 @@ Lists of files to include in the installer
!macroend
!macro FileListQtPlatforms COMMAND DIRECTORY
${FILE}qminimal.dll"
${FILE}qoffscreen.dll"
${FILE}qwindows.dll"
!macroend
!macro FileListMSVC COMMAND DIRECTORY
# Manifest not needed for 2010
@ -57,15 +65,6 @@ Lists of files to include in the installer
!macroend
!macro FileListDll COMMAND DIRECTORY
${FILE}iconv.dll"
${FILE}intl.dll"
${FILE}libhunspell.dll"
${FILE}zlibwapi.dll"
!macroend
!macro FileListNetpbmBin COMMAND DIRECTORY
${FILE}libnetpbm10.dll"
@ -108,13 +107,6 @@ Lists of files to include in the installer
!macroend
!macro FileListPDFToolsBin COMMAND DIRECTORY
${FILE}pdfopen.exe"
${FILE}pdfclose.exe"
!macroend
!macro FileListPDFViewBin COMMAND DIRECTORY
${FILE}pdfview.exe"

4
development/Win32/packaging/installer/setup/install.nsh
View File

@ -47,20 +47,20 @@ Section -ProgramFiles SecProgramFiles
SetOutPath "$INSTDIR\bin"
!insertmacro FileListLyXBin File "${FILES_LYX}\bin\"
!insertmacro FileListQtBin File "${FILES_QT}\bin\"
!insertmacro FileListDll File "${FILES_DEPS}\bin\"
!insertmacro FileListMSVC File "${FILES_MSVC}\"
!insertmacro FileListNetpbmBin File "${FILES_NETPBM}\"
!insertmacro FileListDTLBin File "${FILES_DTL}\"
!insertmacro FileListRsvg File "${FILES_RSVG}\"
!insertmacro FileListDvipostBin File "${FILES_DVIPOST}\"
!insertmacro FileListPDFViewBin File "${FILES_PDFVIEW}\"
!insertmacro FileListPDFToolsBin File "${FILES_PDFTOOLS}\"
# Qt plugin DLLs
SetOutPath "$INSTDIR\bin\imageformats"
!insertmacro FileListQtImageformats File "${FILES_QT}\plugins\imageformats\"
SetOutPath "$INSTDIR\bin\iconengines"
!insertmacro FileListQtIconengines File "${FILES_QT}\plugins\iconengines\"
SetOutPath "$INSTDIR\bin\platforms"
!insertmacro FileListQtPlatforms File "${FILES_QT}\plugins\platforms\"
# Resources
SetOutPath "$INSTDIR"