OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9a58a03)
Update 64-bit project/solution files.
authorKimmo Varis <kimmov@gmail.com>
Sat, 18 Apr 2009 16:57:43 +0000 (16:57 +0000)
committerKimmo Varis <kimmov@gmail.com>
Sat, 18 Apr 2009 16:57:43 +0000 (16:57 +0000)
Src/MergeX64.vcproj patch | blob | history
WinMergeX64.sln patch | blob | history

diff --git a/Src/MergeX64.vcproj b/Src/MergeX64.vcproj
index e195cae..81d4d2d 100644 (file)
--- a/Src/MergeX64.vcproj
+++ b/Src/MergeX64.vcproj
@@ -2756,6 +2756,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2777,6 +2779,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -2799,6 +2803,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -2820,6 +2826,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -2841,6 +2849,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -2862,6 +2872,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
@@ -3658,136 +3670,6 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
-                               RelativePath="common\CShellFileOp.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeRelease|x64"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="UnicodeDebug|x64"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|x64"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|x64"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="X64 Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="X64 Debug|x64"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="0"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                               BrowseInformation="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="X64 Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="X64 Release|x64"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               Optimization="1"\r
-                                               AdditionalIncludeDirectories=""\r
-                                               PreprocessorDefinitions=""\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-                       <File\r
                                RelativePath="Common\CSubclass.cpp"\r
                                >\r
                                <FileConfiguration\r
@@ -4328,6 +4210,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -4349,6 +4233,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -4371,6 +4257,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -4392,6 +4280,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -4413,6 +4303,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -4434,6 +4326,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
@@ -4598,6 +4492,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -4619,6 +4515,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -4641,6 +4539,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -4662,6 +4562,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -4683,6 +4585,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -4704,6 +4608,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
@@ -6032,6 +5938,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -6053,6 +5961,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -6075,6 +5985,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -6096,6 +6008,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -6117,6 +6031,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -6138,6 +6054,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
@@ -8656,6 +8574,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -8677,6 +8597,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -8699,6 +8621,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -8720,6 +8644,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -8741,6 +8667,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -8762,6 +8690,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
@@ -8916,6 +8846,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -8937,6 +8869,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -8959,6 +8893,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -8980,6 +8916,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -9001,6 +8939,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -9022,6 +8962,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
@@ -11132,6 +11074,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -11153,6 +11097,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -11175,6 +11121,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -11196,6 +11144,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -11217,6 +11167,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -11238,6 +11190,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
@@ -16862,6 +16816,64 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\Common\ShellFileOperations.cpp"\r
+                               >\r
+                               <FileConfiguration\r
+                                       Name="UnicodeRelease|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="UnicodeDebug|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Debug|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="X64 Debug|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                       />\r
+                               </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="X64 Release|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
+                                       />\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
                                RelativePath="Common\sizecbar.cpp"\r
                                >\r
                                <FileConfiguration\r
@@ -17934,6 +17946,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -17955,6 +17969,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -17977,6 +17993,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -17998,6 +18016,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -18019,6 +18039,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -18040,6 +18062,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
@@ -19467,6 +19491,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -19488,6 +19514,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -19510,6 +19538,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -19531,6 +19561,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -19552,6 +19584,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -19573,6 +19607,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
@@ -19597,6 +19633,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -19618,6 +19656,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -19640,6 +19680,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -19661,6 +19703,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -19682,6 +19726,8 @@
                                                Optimization="0"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                                BrowseInformation="1"\r
                                        />\r
                                </FileConfiguration>\r
@@ -19703,6 +19749,8 @@
                                                Optimization="1"\r
                                                AdditionalIncludeDirectories=""\r
                                                PreprocessorDefinitions=""\r
+                                               UsePrecompiledHeader="0"\r
+                                               PrecompiledHeaderThrough=""\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
@@ -20584,10 +20632,6 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="common\CShellFileOp.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
                                RelativePath="Common\CSubclass.h"\r
                                >\r
                        </File>\r
@@ -21036,6 +21080,10 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\Common\ShellFileOperations.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath="Common\sizecbar.h"\r
                                >\r
                        </File>\r
diff --git a/WinMergeX64.sln b/WinMergeX64.sln
index 9a3d464..3e3f4bc 100644 (file)
--- a/WinMergeX64.sln
+++ b/WinMergeX64.sln
@@ -18,8 +18,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scew", "Externals\scew\win3
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MergeLang", "Src\MergeLangX64.vcproj", "{4B011DDA-2279-437D-903C-8028913AF31B}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "heksedit", "Externals\heksedit\hekseditX64.vcproj", "{15EE10B9-011A-4781-ACBC-22F1CFEB5610}"\r
-EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug Unicode|Win32 = Debug Unicode|Win32\r
@@ -156,30 +154,6 @@ Global
                {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Release|Win32.Build.0 = X64 Release|Win32\r
                {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Release|x64.ActiveCfg = X64 Release|x64\r
                {4B011DDA-2279-437D-903C-8028913AF31B}.X64 Release|x64.Build.0 = X64 Release|x64\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode|Win32.ActiveCfg = Debug|Win32\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode|Win32.Build.0 = Debug|Win32\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode|x64.ActiveCfg = Debug|x64\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug Unicode|x64.Build.0 = Debug|x64\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug|Win32.Build.0 = Debug|Win32\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug|x64.ActiveCfg = Debug|x64\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Debug|x64.Build.0 = Debug|x64\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode|Win32.ActiveCfg = Release|Win32\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode|Win32.Build.0 = Release|Win32\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode|x64.ActiveCfg = Release|x64\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release Unicode|x64.Build.0 = Release|x64\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release|Win32.ActiveCfg = Release|Win32\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release|Win32.Build.0 = Release|Win32\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release|x64.ActiveCfg = Release|x64\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.Release|x64.Build.0 = Release|x64\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug|Win32.ActiveCfg = X64 Debug|x64\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug|Win32.Build.0 = X64 Debug|x64\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug|x64.ActiveCfg = X64 Debug|x64\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Debug|x64.Build.0 = X64 Debug|x64\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release|Win32.ActiveCfg = X64 Release|Win32\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release|Win32.Build.0 = X64 Release|Win32\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release|x64.ActiveCfg = X64 Release|x64\r
-               {15EE10B9-011A-4781-ACBC-22F1CFEB5610}.X64 Release|x64.Build.0 = X64 Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
About OSDN
Find Software
Develop Software
Help