Fix Miss ATL Library at setup package

Signed-off-by: Frank Li <lznuaa@gmail.com>

diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index 0cd83c0..3aa4116 100644 (file)
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -19,6 +19,8 @@
         <Directory Id="INSTALLDIR" ShortName="TGIT" Name="TortoiseGit">\r
 \r
           <?if $(var.Platform) = "x86" ?>\r
+                 <Merge Id='ATL' Language='0' SourceFile='$(var.MergeModules)\Microsoft_VC90_ATL_x86.msm' DiskId='1' />\r
+                 <Merge Id='ATL Policy' Language='0' SourceFile='$(var.MergeModules)\policy_9_0_Microsoft_VC90_ATL_x86.msm' DiskId='1' />\r
           <Merge Id='CRT' Language='0' SourceFile='$(var.MergeModules)\microsoft_vc90_crt_x86.msm' DiskId='1' />\r
           <Merge Id='CRT Policy' Language='0' SourceFile='$(var.MergeModules)\policy_9_0_Microsoft_VC90_CRT_x86.msm' DiskId='1' />\r
           <Merge Id='MFC' Language='0' SourceFile='$(var.MergeModules)\Microsoft_VC90_MFC_x86.msm' DiskId='1' />\r
@@ -28,6 +30,8 @@
           <?endif ?>\r
 \r
           <?if $(var.Platform) = "x64" ?>\r
+                 <Merge Id='ATL' Language='0' SourceFile='$(var.MergeModules)\Microsoft_VC90_ATL_x86_x64.msm' DiskId='1' />\r
+                 <Merge Id='ATL Policy' Language='0' SourceFile='$(var.MergeModules)\policy_9_0_Microsoft_VC90_ATL_x86_x64.msm' DiskId='1' />            \r
           <Merge Id='CRT' Language='0' SourceFile='$(var.MergeModules)\Microsoft_VC90_CRT_x86_x64.msm' DiskId='1' />\r
           <Merge Id='CRT Policy' Language='0' SourceFile='$(var.MergeModules)\policy_9_0_Microsoft_VC90_CRT_x86_x64.msm' DiskId='1' />\r
           <Merge Id='MFC' Language='0' SourceFile='$(var.MergeModules)\Microsoft_VC90_MFC_x86_x64.msm' DiskId='1' />\r

diff --git a/src/TortoiseGitSetup/VersionNumberInclude.wxi b/src/TortoiseGitSetup/VersionNumberInclude.wxi
index bb881fa..297d03f 100644 (file)
--- a/src/TortoiseGitSetup/VersionNumberInclude.wxi
+++ b/src/TortoiseGitSetup/VersionNumberInclude.wxi
@@ -2,6 +2,6 @@
 <Include Id="VersionNumberInclude">\r
        <?define MajorVersion="0" ?>\r
        <?define MinorVersion="4" ?>\r
-       <?define MicroVersion="1" ?>\r
+       <?define MicroVersion="2" ?>\r
        <?define BuildVersion="0" ?>\r
 </Include>\r