Merge.vcxproj: Use $(OutDir) macro

--HG--
branch : stable

diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
index ef680e2..3b19914 100644 (file)
--- a/Src/Merge.vcxproj
+++ b/Src/Merge.vcxproj
@@ -166,7 +166,7 @@
     <Link>\r
       <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>\r
       <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>..\Build\MergeUnicodeRelease\WinMergeU.exe</OutputFile>\r
+      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\Build\expat;..\Build\scew;..\Build\heksedit;..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
@@ -222,7 +222,7 @@
     <Link>\r
       <AdditionalOptions>/verbose:lib %(AdditionalOptions)</AdditionalOptions>\r
       <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>..\Build\X64\MergeUnicodeRelease\WinMergeU.exe</OutputFile>\r
+      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\Build\expat\X64;..\Build\scew\X64;..\Build\heksedit\X64;..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <IgnoreSpecificDefaultLibraries>msvcrtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>\r
@@ -272,7 +272,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>..\Build\MergeUnicodeDebug/WinMergeU.exe</OutputFile>\r
+      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\Build\expat;..\Build\scew;..\Build\heksedit;..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -320,7 +320,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>..\Build\MergeUnicodeDebug/WinMergeU.exe</OutputFile>\r
+      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\Build\expat;..\Build\scew;..\Build\heksedit;..\Externals\poco\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -372,7 +372,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>..\Build\X64\MergeUnicodeDebug/WinMergeU.exe</OutputFile>\r
+      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\Build\expat\X64;..\Build\scew\X64;..\Build\heksedit\X64;..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -426,7 +426,7 @@
     </ResourceCompile>\r
     <Link>\r
       <AdditionalDependencies>version.lib;shlwapi.lib;imm32.lib;HtmlHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-      <OutputFile>..\Build\X64\MergeUnicodeDebug/WinMergeU.exe</OutputFile>\r
+      <OutputFile>$(OutDir)/WinMergeU.exe</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\Build\expat\X64;..\Build\scew\X64;..\Build\heksedit\X64;..\Externals\poco\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r