Enable X64 Build

[tortoisegit/TortoiseGitJp.git] / src / TortoiseGitSetup / WiXSetup.wixproj

diff --git a/src/TortoiseGitSetup/WiXSetup.wixproj b/src/TortoiseGitSetup/WiXSetup.wixproj
index 7f5a3f1..da0567d 100644 (file)
--- a/src/TortoiseGitSetup/WiXSetup.wixproj
+++ b/src/TortoiseGitSetup/WiXSetup.wixproj
@@ -10,27 +10,37 @@
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets</WixTargetsPath>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">\r
-    <OutputPath>..\..\bin\$(Configuration)\</OutputPath>\r
+    <OutputPath>..\..\bin\setup\</OutputPath>\r
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>\r
-    <DefineConstants>Debug;DictionaryENUS=1;DictionaryENGB=0;IncludeCrashReportDll=0;</DefineConstants>\r
+    <DefineConstants>Debug;IncludeCrashReportDll=0;DictionaryENGB=0;DictionaryENUS=1;MergeModules=C:\Program Files\Common Files\Merge Modules;</DefineConstants>\r
     <WixVariables>\r
     </WixVariables>\r
+    <SuppressSpecificWarnings>\r
+    </SuppressSpecificWarnings>\r
   </PropertyGroup>\r
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">\r
-    <OutputPath>bin\$(Configuration)\</OutputPath>\r
+    <OutputPath>..\..\bin\setup\x86\</OutputPath>\r
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>\r
+    <DefineConstants>IncludeCrashReportDll=0;DictionaryENGB=0;DictionaryENUS=1;MergeModules=C:\Program Files\Common Files\Merge Modules;</DefineConstants>\r
+    <SuppressSpecificWarnings>\r
+    </SuppressSpecificWarnings>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">\r
+    <DefineConstants>Debug;IncludeCrashReportDll=0;DictionaryENGB=0;DictionaryENUS=1;MergeModules=C:\Program Files\Common Files\Merge Modules;</DefineConstants>\r
+    <WixVariables>\r
+    </WixVariables>\r
+    <SuppressSpecificWarnings>\r
+    </SuppressSpecificWarnings>\r
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>\r
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">\r
+    <DefineConstants>IncludeCrashReportDll=0;DictionaryENGB=0;DictionaryENUS=1;MergeModules=C:\Program Files\Common Files\Merge Modules;</DefineConstants>\r
+    <SuppressSpecificWarnings>\r
+    </SuppressSpecificWarnings>\r
+    <OutputPath>..\..\bin\setup\x64\</OutputPath>\r
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>\r
   </PropertyGroup>\r
-  <ItemGroup>\r
-    <Compile Include="FeaturesFragment.wxs" />\r
-    <Compile Include="StructureFragment.wxs" />\r
-    <Compile Include="SubWCRev.wxs" />\r
-    <Compile Include="TortoiseSVN.wxs" />\r
-    <Compile Include="UIFragment.wxs" />\r
-    <Compile Include="WixUI_Simplest.wxs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Content Include="Includes.wxi" />\r
-  </ItemGroup>\r
   <Import Project="$(WixTargetsPath)" />\r
   <!--\r
        To modify your build process, add your task inside one of the targets below and uncomment it.\r
@@ -40,4 +50,15 @@
        <Target Name="AfterBuild">\r
        </Target>\r
        -->\r
+  <ItemGroup>\r
+    <Compile Include="TortoiseSVN.wxs" />\r
+    <Compile Include="WixUI_Simplest.wxs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Content Include="FeaturesFragment.wxi" />\r
+    <Content Include="Includes.wxi" />\r
+    <Content Include="StructureFragment.wxi" />\r
+    <Content Include="UIFragment.wxi" />\r
+    <Content Include="VersionNumberInclude.wxi" />\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file