Revert "installer: remove useless define"

This reverts commit 88c55621af.
2012-09-30 09:38:03 +02:00 · 2012-09-30 09:38:03 +02:00 · 9b093b404c
parent c65ac603e9
commit 9b093b404c
2 changed files with 2 additions and 0 deletions
--- a/win_installer/config.wxi
+++ b/win_installer/config.wxi
@ -9,4 +9,5 @@
  <?define TranslationsDir = "..\gui" ?>
  <?define HelpDir = "..\gui\help" ?>
  <?define QtDllDir = "..\..\runtimes" ?>
+  <?define CrtMergeModule = "$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC90_CRT_x86.msm" ?>
 </Include>
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@ -74,6 +74,7 @@
            <RemoveFile Id="qtsql4dll" On="install" Name="qtsql4.dll" />
          </Component>
        </Directory>
+        <!-- <Merge Id="CRT" Language="0" SourceFile="$(var.CrtMergeModule)" DiskId="1" /> -->
      </Directory>

      <Directory Id='ProgramMenuFolder' Name='Programs' >