walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Installer: Add variable for Qt dll location.

This commit is contained in:
Kimmo Varis 2010-01-17 01:09:14 +02:00
parent 38ef24c388
commit a969a1aa9a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
win_installer/cppcheck.wxs
View File

@ -24,9 +24,9 @@
WorkingDirectory='INSTALLDIR' Icon="gui.exe" IconIndex="0" Advertise="yes" />
</File>
<!-- <File Id='mingwm10dll' Name='mingwm10.dll' Source='mingwm10.dll' /> -->
<File Id='qtcore4dll' Name='qtcore4.dll' Source='qtcore4.dll' />
<File Id='qtgui4dll' Name='qtgui4.dll' Source='qtgui4.dll' />
<File Id='qtxml4dll' Name='qtxml4.dll' Source='qtxml4.dll' />
<File Id='qtcore4dll' Name='qtcore4.dll' Source='$(var.QtDllDir)\qtcore4.dll' />
<File Id='qtgui4dll' Name='qtgui4.dll' Source='$(var.QtDllDir)\qtgui4.dll' />
<File Id='qtxml4dll' Name='qtxml4.dll' Source='$(var.QtDllDir)\qtxml4.dll' />
</Component>
<Component Id='authors.txt' Guid='*'>
<File Id='authors.txt' Name='authors.txt' DiskId='1' Source='..\authors' KeyPath='yes' />

1
win_installer/productInfo.wxi
View File

@ -14,5 +14,6 @@
<?define CliBuildDir = "..\cli\release" ?>
<?define GuiBuildDir = "..\gui\release" ?>
<?define QtDllDir = "..\..\runtimes" ?>
<?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_CRT_x86.msm" ?>
</Include>