From afb5a0758cd2044f96ac43d4c5db1dcd6d771fe1 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Fri, 18 May 2012 19:59:29 +0200
Subject: [PATCH] fixed obj directories of WiX project

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 Languages/Lang_de.wixproj             | 8 ++++----
 Languages/Lang_fr.wixproj             | 8 ++++----
 Languages/Lang_pt_BR.wixproj          | 8 ++++----
 Languages/Lang_ru.wixproj             | 8 ++++----
 Languages/Lang_zh_CN.wixproj          | 8 ++++----
 Languages/Lang_zh_TW.wixproj          | 8 ++++----
 src/TortoiseGitSetup/WiXSetup.wixproj | 8 ++++----
 7 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/Languages/Lang_de.wixproj b/Languages/Lang_de.wixproj
index 58e49bc5a..92f9b3d25 100644
--- a/Languages/Lang_de.wixproj
+++ b/Languages/Lang_de.wixproj
@@ -11,12 +11,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_de\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>..\bin\setup\x86\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_de\$(Configuration)\</IntermediateOutputPath>
     <WixVariables>
     </WixVariables>
     <DefineConstants>TSVNHelpFile=0;TMergeHelpFile=0;TSVNMoFile=0;COUNTRYID=1031;LANGNATIVE=German;</DefineConstants>
@@ -24,12 +24,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <OutputPath>bin\$(Configuration)64\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)64\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_de\$(Configuration)64\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     <OutputPath>..\bin\setup\x64\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)64\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_de\$(Configuration)64\</IntermediateOutputPath>
     <WixVariables>
     </WixVariables>
     <DefineConstants>TSVNHelpFile=0;TMergeHelpFile=0;TSVNMoFile=0;COUNTRYID=1031;LANGNATIVE=German;</DefineConstants>
diff --git a/Languages/Lang_fr.wixproj b/Languages/Lang_fr.wixproj
index 23caa49ad..fb8421642 100644
--- a/Languages/Lang_fr.wixproj
+++ b/Languages/Lang_fr.wixproj
@@ -11,12 +11,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_fr\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>..\bin\setup\x86\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_fr\$(Configuration)\</IntermediateOutputPath>
     <WixVariables>
     </WixVariables>
     <DefineConstants>TSVNHelpFile=0;TMergeHelpFile=0;TSVNMoFile=0;COUNTRYID=1036;LANGNATIVE=French;</DefineConstants>
@@ -24,12 +24,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <OutputPath>bin\$(Configuration)64\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)64\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_fr\$(Configuration)64\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     <OutputPath>..\bin\setup\x64\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)64\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_fr\$(Configuration)64\</IntermediateOutputPath>
     <WixVariables>
     </WixVariables>
     <DefineConstants>TSVNHelpFile=0;TMergeHelpFile=0;TSVNMoFile=0;COUNTRYID=1036;LANGNATIVE=French;</DefineConstants>
diff --git a/Languages/Lang_pt_BR.wixproj b/Languages/Lang_pt_BR.wixproj
index 962ce500a..6231c1903 100644
--- a/Languages/Lang_pt_BR.wixproj
+++ b/Languages/Lang_pt_BR.wixproj
@@ -11,12 +11,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_pt_BR\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>..\bin\setup\x86\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_pt_BR\$(Configuration)\</IntermediateOutputPath>
     <WixVariables>
     </WixVariables>
     <DefineConstants>TSVNHelpFile=0;TMergeHelpFile=0;TSVNMoFile=0;COUNTRYID=1046;LANGNATIVE='Portuguese (Brazil)';</DefineConstants>
@@ -24,12 +24,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <OutputPath>bin\$(Configuration)64\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)64\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_pt_BR\$(Configuration)64\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     <OutputPath>..\bin\setup\x64\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)64\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_pt_BR\$(Configuration)64\</IntermediateOutputPath>
     <WixVariables>
     </WixVariables>
     <DefineConstants>TSVNHelpFile=0;TMergeHelpFile=0;TSVNMoFile=0;COUNTRYID=1046;LANGNATIVE='Portuguese (Brazil)';</DefineConstants>
diff --git a/Languages/Lang_ru.wixproj b/Languages/Lang_ru.wixproj
index 179dd8191..ef804adea 100644
--- a/Languages/Lang_ru.wixproj
+++ b/Languages/Lang_ru.wixproj
@@ -11,12 +11,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_ru\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>..\bin\setup\x86\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_ru\$(Configuration)\</IntermediateOutputPath>
     <WixVariables>
     </WixVariables>
     <DefineConstants>TSVNHelpFile=0;TMergeHelpFile=0;TSVNMoFile=0;COUNTRYID=1049;LANGNATIVE=Russian;</DefineConstants>
@@ -24,12 +24,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <OutputPath>bin\$(Configuration)64\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)64\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_ru\$(Configuration)64\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     <OutputPath>..\bin\setup\x64\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)64\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_ru\$(Configuration)64\</IntermediateOutputPath>
     <WixVariables>
     </WixVariables>
     <DefineConstants>TSVNHelpFile=0;TMergeHelpFile=0;TSVNMoFile=0;COUNTRYID=1049;LANGNATIVE=Russian;</DefineConstants>
diff --git a/Languages/Lang_zh_CN.wixproj b/Languages/Lang_zh_CN.wixproj
index f71fad996..e6dd39c79 100644
--- a/Languages/Lang_zh_CN.wixproj
+++ b/Languages/Lang_zh_CN.wixproj
@@ -11,12 +11,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_zh_CN\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>..\bin\setup\x86\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_zh_CN\$(Configuration)\</IntermediateOutputPath>
     <WixVariables>
     </WixVariables>
     <DefineConstants>TSVNHelpFile=0;TMergeHelpFile=0;TSVNMoFile=0;COUNTRYID=2052;LANGNATIVE='Chinese (simplified)';</DefineConstants>
@@ -24,12 +24,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <OutputPath>bin\$(Configuration)64\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)64\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_zh_CN\$(Configuration)64\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     <OutputPath>..\bin\setup\x64\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)64\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_zh_CN\$(Configuration)64\</IntermediateOutputPath>
     <WixVariables>
     </WixVariables>
     <DefineConstants>TSVNHelpFile=0;TMergeHelpFile=0;TSVNMoFile=0;COUNTRYID=2052;LANGNATIVE='Chinese (simplified)';</DefineConstants>
diff --git a/Languages/Lang_zh_TW.wixproj b/Languages/Lang_zh_TW.wixproj
index c6cd8543e..43a19ff48 100644
--- a/Languages/Lang_zh_TW.wixproj
+++ b/Languages/Lang_zh_TW.wixproj
@@ -11,12 +11,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_zh_TW\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>..\bin\setup\x86\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_zh_TW\$(Configuration)\</IntermediateOutputPath>
     <WixVariables>
     </WixVariables>
     <DefineConstants>TSVNHelpFile=0;TMergeHelpFile=0;TSVNMoFile=0;COUNTRYID=1028;LANGNATIVE='Chinese (traditional)';</DefineConstants>
@@ -24,12 +24,12 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <OutputPath>bin\$(Configuration)64\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)64\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_zh_TW\$(Configuration)64\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     <OutputPath>..\bin\setup\x64\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)64\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\obj\Lang_zh_TW\$(Configuration)64\</IntermediateOutputPath>
     <WixVariables>
     </WixVariables>
     <DefineConstants>TSVNHelpFile=0;TMergeHelpFile=0;TSVNMoFile=0;COUNTRYID=1028;LANGNATIVE='Chinese (traditional)';</DefineConstants>
diff --git a/src/TortoiseGitSetup/WiXSetup.wixproj b/src/TortoiseGitSetup/WiXSetup.wixproj
index e896cb6ae..5bb4a8b09 100644
--- a/src/TortoiseGitSetup/WiXSetup.wixproj
+++ b/src/TortoiseGitSetup/WiXSetup.wixproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>..\..\bin\setup\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\..\obj\TortoiseGitSetup\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug;IncludeCrashReportDll=0;DictionaryENGB=0;DictionaryENUS=1;</DefineConstants>
     <WixVariables>
     </WixVariables>
@@ -20,7 +20,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>..\..\bin\setup\x86\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\..\obj\TortoiseGitSetup\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>IncludeCrashReportDll=1;DictionaryENGB=0;DictionaryENUS=1;</DefineConstants>
     <SuppressSpecificWarnings>
     </SuppressSpecificWarnings>
@@ -32,14 +32,14 @@
     <SuppressSpecificWarnings>
     </SuppressSpecificWarnings>
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\..\obj\TortoiseGitSetup\$(Configuration)64\</IntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     <DefineConstants>IncludeCrashReportDll=1;DictionaryENGB=0;DictionaryENUS=1;</DefineConstants>
     <SuppressSpecificWarnings>
     </SuppressSpecificWarnings>
     <OutputPath>..\..\bin\setup\x64\</OutputPath>
-    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath>..\..\obj\TortoiseGitSetup\$(Configuration)64\</IntermediateOutputPath>
   </PropertyGroup>
   <Import Project="$(WixTargetsPath)" />
   <!--
-- 
2.11.4.GIT