Merge with stable

[winmerge-jp/winmerge-jp.git] / Src / Merge.vcxproj

diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
index 7b0cafc..70f3670 100644 (file)
--- a/Src/Merge.vcxproj
+++ b/Src/Merge.vcxproj
@@ -976,6 +976,7 @@
     </ClCompile>\r
     <ClCompile Include="Common\CSubclass.cpp">\r
     </ClCompile>\r
+    <ClCompile Include="CustomStatusCursor.cpp" />\r
     <ClCompile Include="ImgMergeFrm.cpp" />\r
     <ClCompile Include="Merge7zFormatMergePluginImpl.cpp">\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
@@ -1113,6 +1114,14 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">NotUsing</PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="DirActions.cpp">\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">NotUsing</PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="DirCmpReport.cpp">\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
@@ -1174,9 +1183,15 @@
     </ClCompile>\r
     <ClCompile Include="DirView.cpp">\r
     </ClCompile>\r
-    <ClCompile Include="DirViewColHandler.cpp">\r
-    </ClCompile>\r
     <ClCompile Include="DirViewColItems.cpp">\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|Win32'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">NotUsing</PrecompiledHeader>\r
     </ClCompile>\r
     <ClCompile Include="Common\dllproxy.c">\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
@@ -1748,10 +1763,6 @@
     <ClCompile Include="Common\SortHeaderCtrl.cpp">\r
     </ClCompile>\r
     <ClCompile Include="SourceControl.cpp">\r
-    </ClCompile>\r
-    <ClCompile Include="Common\SplitterWndEx.cpp">\r
-    </ClCompile>\r
-    <ClCompile Include="ssapi.cpp">\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'">NotUsing</PrecompiledHeader>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>\r
@@ -1763,6 +1774,8 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">NotUsing</PrecompiledHeader>\r
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode + Code Analysis|x64'">NotUsing</PrecompiledHeader>\r
     </ClCompile>\r
+    <ClCompile Include="Common\SplitterWndEx.cpp">\r
+    </ClCompile>\r
     <ClCompile Include="Common\StatLink.cpp">\r
     </ClCompile>\r
     <ClCompile Include="StdAfx.cpp">\r
@@ -2145,6 +2158,7 @@
     <ClInclude Include="Common\coretools.h" />\r
     <ClInclude Include="Common\coretypes.h" />\r
     <ClInclude Include="Common\CSubclass.h" />\r
+    <ClInclude Include="DirActions.h" />\r
     <ClInclude Include="HexMergeView.h" />\r
     <ClInclude Include="IMergeDoc.h" />\r
     <ClInclude Include="ImgMergeFrm.h" />\r