From f556f582c323f19e50f7b1cd300d2f8e23bc88b1 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Wed, 27 Jul 2011 15:16:26 +0200 Subject: [PATCH] modified the installer to pick dll from the custom qt compiled version --- Sankore 3.1.iss | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Sankore 3.1.iss b/Sankore 3.1.iss index aded5e63..c93a94e8 100644 --- a/Sankore 3.1.iss +++ b/Sankore 3.1.iss @@ -47,7 +47,21 @@ Type: files ; Name: "{app}\*.dll" Source: "..\Sankore-ThirdParty\microsoft\vcredist_x86.exe"; DestDir:"{tmp}" Source: ".\build\win32\release\product\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: ".\runtime\windows\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; -Source: ".\resources\win\plugins\*"; DestDir: "{app}"; Flags: recursesubdirs createallsubdirs + +;Source: ".\resources\win\plugins\*"; DestDir: "{app}"; Flags: recursesubdirs createallsubdirs +;Qt base dll +Source: "..Qt-sankore3.1\lib\QtScript4.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..Qt-sankore3.1\lib\QtGui4.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..Qt-sankore3.1\lib\QtXml4.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..Qt-sankore3.1\lib\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..Qt-sankore3.1\lib\QtWebKit4.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..Qt-sankore3.1\lib\phonon.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..Qt-sankore3.1\lib\QtNetwork4.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..Qt-sankore3.1\lib\QtSvg4.dll"; DestDir: "{app}"; Flags: ignoreversion + +;Qt plugins +Source: "..\Qt-sankore3.1\plugins\imageformats\qjpeg4.dll"; DestDir: "{app}\plugins\imageformats"; Flags: ignoreversion +Source: "..\Qt-sankore3.1\plugins\imageformats\qsvg4.dll"; DestDir: "{app}\plugins\imageformats"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] @@ -90,4 +104,4 @@ end; function isProcessorNotX64: Boolean; begin Result := not isProcessorX64; -end; \ No newline at end of file +end;