[commit] r1106 - trunk/Install

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Dec  3 10:19:00 2010
New Revision: 1106

Log:
Need MFC100 and ATL100. Maybe we can get rid of VC9 runtimes?

Modified:
   trunk/Install/GME.wxs

Modified: trunk/Install/GME.wxs
==============================================================================
--- trunk/Install/GME.wxs	Thu Dec  2 17:32:51 2010	(r1105)
+++ trunk/Install/GME.wxs	Fri Dec  3 10:19:00 2010	(r1106)
@@ -256,6 +256,8 @@
             <Merge Id="ATL" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC90_ATL_x86.msm" DiskId="1" />
             <Merge Id="ATL Policy" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\policy_9_0_Microsoft_VC90_ATL_x86.msm" DiskId="1" />
             <Merge Id="CRT100" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_CRT_x86.msm" DiskId="1" />
+            <Merge Id="MFC100" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_MFC_x86.msm" DiskId="1" />
+            <Merge Id="ATL100" Language="0" SourceFile="$(env.ProgramFiles)\Common Files\Merge Modules\Microsoft_VC100_ATL_x86.msm" DiskId="1" />
         </DirectoryRef>
 
         <!-- =========================================================== -->
@@ -2207,6 +2209,8 @@
                 <MergeRef Id='ATL' />
                 <MergeRef Id='ATL Policy' />
                 <MergeRef Id='CRT100' />
+                <MergeRef Id='MFC100' />
+                <MergeRef Id='ATL100' />
             </Feature>
             
             <Feature Id='Samples' Title='Samples' Description='These are sample paradigms and interpreters with source code'