OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6b258e8)
Update various .sln and .vcxproj properties to latest VS2017 levels
authorGreyMerlin <greymerlin7@gmail.com>
Mon, 17 Dec 2018 19:43:32 +0000 (11:43 -0800)
committerGreyMerlin <greymerlin7@gmail.com>
Mon, 17 Dec 2018 19:43:32 +0000 (11:43 -0800)
--HG--
branch : stable

12 files changed:
ArchiveSupport/Merge7z/Merge7z.vs2017.sln patch | blob | history
ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj patch | blob | history
Externals/crystaledit/Sample/SampleStatic.vs2017.sln patch | blob | history
Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj patch | blob | history
Externals/poco/Foundation/Foundation.vs2017.vcxproj patch | blob | history
Externals/poco/Util/Util.vs2017.vcxproj patch | blob | history
Externals/poco/XML/XML.vs2017.vcxproj patch | blob | history
ShellExtension/ShellExtension.vs2017.sln patch | blob | history
ShellExtension/ShellExtension.vs2017.vcxproj patch | blob | history
Src/Merge.vs2017.vcxproj patch | blob | history
Src/MergeLang.vs2017.vcxproj patch | blob | history
Testing/GoogleTest/UnitTests/UnitTests.vs2017.vcxproj patch | blob | history

diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2017.sln b/ArchiveSupport/Merge7z/Merge7z.vs2017.sln
index 8a9579c..7990492 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z.vs2017.sln
+++ b/ArchiveSupport/Merge7z/Merge7z.vs2017.sln
@@ -1,7 +1,6 @@
-\r
 Microsoft Visual Studio Solution File, Format Version 12.00\r
-# Visual Studio 14\r
-VisualStudioVersion = 14.0.25123.0\r
+# Visual Studio 15\r
+VisualStudioVersion = 15.0.27130.0\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Merge7z.vs2017", "Merge7z.vs2017.vcxproj", "{FFB6D02A-782B-48EF-8398-7F8862859616}"\r
 EndProject\r
diff --git a/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj b/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj
index 8d7f774..55a185a 100644 (file)
--- a/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj
+++ b/ArchiveSupport/Merge7z/Merge7z.vs2017.vcxproj
@@ -22,7 +22,7 @@
     <ProjectGuid>{FFB6D02A-782B-48EF-8398-7F8862859616}</ProjectGuid>\r
     <SccProjectName />\r
     <SccLocalPath />\r
-    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>\r
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2017.sln b/Externals/crystaledit/Sample/SampleStatic.vs2017.sln
index b510ad0..0785931 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vs2017.sln
+++ b/Externals/crystaledit/Sample/SampleStatic.vs2017.sln
@@ -1,7 +1,6 @@
-\r
 Microsoft Visual Studio Solution File, Format Version 12.00\r
 # Visual Studio 15\r
-VisualStudioVersion = 15.0.28010.2016\r
+VisualStudioVersion = 15.0.27130.0\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleStatic.vs2017", "SampleStatic.vs2017.vcxproj", "{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}"\r
 EndProject\r
diff --git a/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj b/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj
index a0e351d..e6f4b44 100644 (file)
--- a/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj
+++ b/Externals/crystaledit/Sample/SampleStatic.vs2017.vcxproj
@@ -38,7 +38,7 @@
     <ProjectGuid>{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}</ProjectGuid>\r
     <RootNamespace>SampleStatic</RootNamespace>\r
     <Keyword>MFCProj</Keyword>\r
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>\r
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">\r
@@ -162,7 +162,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
@@ -201,7 +201,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
@@ -240,7 +240,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
@@ -279,7 +279,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
@@ -317,7 +317,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_MBCS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <MinimalRebuild>true</MinimalRebuild>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
@@ -357,7 +357,7 @@
     </Midl>\r
     <ClCompile>\r
       <Optimization>Disabled</Optimization>\r
-      <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_MBCS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>\r
       <PrecompiledHeader>Use</PrecompiledHeader>\r
@@ -397,7 +397,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_MBCS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
@@ -437,7 +437,7 @@
     <ClCompile>\r
       <Optimization>MaxSpeed</Optimization>\r
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>\r
-      <AdditionalIncludeDirectories>.;..\editlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
+      <AdditionalIncludeDirectories>.;..\editlib;..\..\..\Src;..\..\..\Src\Common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_MBCS;EDITPADC_CLASS=;CRYSTALEDIT_ENABLELOADER;CRYSTALEDIT_ENABLESAVER;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
       <StringPooling>true</StringPooling>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
diff --git a/Externals/poco/Foundation/Foundation.vs2017.vcxproj b/Externals/poco/Foundation/Foundation.vs2017.vcxproj
index f94ff4a..cf772d9 100644 (file)
--- a/Externals/poco/Foundation/Foundation.vs2017.vcxproj
+++ b/Externals/poco/Foundation/Foundation.vs2017.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{8164D41D-B053-405B-826C-CF37AC0EF176}</ProjectGuid>
     <RootNamespace>Foundation</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">
diff --git a/Externals/poco/Util/Util.vs2017.vcxproj b/Externals/poco/Util/Util.vs2017.vcxproj
index 0deb8b9..eb87ee1 100644 (file)
--- a/Externals/poco/Util/Util.vs2017.vcxproj
+++ b/Externals/poco/Util/Util.vs2017.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{6FF56CDB-787A-4714-A28C-919003F9FA6C}</ProjectGuid>
     <RootNamespace>Util</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">
diff --git a/Externals/poco/XML/XML.vs2017.vcxproj b/Externals/poco/XML/XML.vs2017.vcxproj
index b055d84..044a05b 100644 (file)
--- a/Externals/poco/XML/XML.vs2017.vcxproj
+++ b/Externals/poco/XML/XML.vs2017.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{9E211743-85FE-4977-82F3-4F04B40C912D}</ProjectGuid>
     <RootNamespace>XML</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">
diff --git a/ShellExtension/ShellExtension.vs2017.sln b/ShellExtension/ShellExtension.vs2017.sln
index 9018f7b..d9f9816 100644 (file)
--- a/ShellExtension/ShellExtension.vs2017.sln
+++ b/ShellExtension/ShellExtension.vs2017.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00\r
 # Visual Studio 15\r
-VisualStudioVersion = 15.0.26730.12\r
+VisualStudioVersion = 15.0.27130.0\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShellExtension", "ShellExtension.vs2017.vcxproj", "{76A538A1-9D2C-49CB-AE9F-72548CE37F88}"\r
 EndProject\r
diff --git a/ShellExtension/ShellExtension.vs2017.vcxproj b/ShellExtension/ShellExtension.vs2017.vcxproj
index 281b825..dbe2fc5 100644 (file)
--- a/ShellExtension/ShellExtension.vs2017.vcxproj
+++ b/ShellExtension/ShellExtension.vs2017.vcxproj
@@ -22,7 +22,7 @@
     <ProjectName>ShellExtension</ProjectName>
     <ProjectGuid>{76A538A1-9D2C-49CB-AE9F-72548CE37F88}</ProjectGuid>
     <RootNamespace>ShellExtension</RootNamespace>
-    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|Win32'" Label="Configuration">
diff --git a/Src/Merge.vs2017.vcxproj b/Src/Merge.vs2017.vcxproj
index 05c29ef..a1e3e80 100644 (file)
--- a/Src/Merge.vs2017.vcxproj
+++ b/Src/Merge.vs2017.vcxproj
@@ -39,42 +39,42 @@
     <UseOfMfc>Static</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v141_xp</PlatformToolset>\r
-       <XPDeprecationWarning>false</XPDeprecationWarning>\r
+    <XPDeprecationWarning>false</XPDeprecationWarning>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|Win32'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <UseOfMfc>Static</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v141</PlatformToolset>\r
-       <XPDeprecationWarning>false</XPDeprecationWarning>\r
+    <XPDeprecationWarning>false</XPDeprecationWarning>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <UseOfMfc>Static</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v141_xp</PlatformToolset>\r
-       <XPDeprecationWarning>false</XPDeprecationWarning>\r
+    <XPDeprecationWarning>false</XPDeprecationWarning>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <UseOfMfc>Static</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v141_xp</PlatformToolset>\r
-       <XPDeprecationWarning>false</XPDeprecationWarning>\r
+    <XPDeprecationWarning>false</XPDeprecationWarning>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Test|x64'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <UseOfMfc>Static</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v141</PlatformToolset>\r
-       <XPDeprecationWarning>false</XPDeprecationWarning>\r
+    <XPDeprecationWarning>false</XPDeprecationWarning>\r
   </PropertyGroup>\r
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'" Label="Configuration">\r
     <ConfigurationType>Application</ConfigurationType>\r
     <UseOfMfc>Static</UseOfMfc>\r
     <CharacterSet>Unicode</CharacterSet>\r
     <PlatformToolset>v141_xp</PlatformToolset>\r
-       <XPDeprecationWarning>false</XPDeprecationWarning>\r
+    <XPDeprecationWarning>false</XPDeprecationWarning>\r
   </PropertyGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
   <ImportGroup Label="ExtensionSettings">\r
diff --git a/Src/MergeLang.vs2017.vcxproj b/Src/MergeLang.vs2017.vcxproj
index 84058e3..997ccc7 100644 (file)
--- a/Src/MergeLang.vs2017.vcxproj
+++ b/Src/MergeLang.vs2017.vcxproj
@@ -23,7 +23,7 @@
     <ProjectGuid>{4B011DDA-2279-437D-903C-8028913AF31B}</ProjectGuid>
     <RootNamespace>MergeLang</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|Win32'" Label="Configuration">
diff --git a/Testing/GoogleTest/UnitTests/UnitTests.vs2017.vcxproj b/Testing/GoogleTest/UnitTests/UnitTests.vs2017.vcxproj
index aff7ebf..4c5a21c 100644 (file)
--- a/Testing/GoogleTest/UnitTests/UnitTests.vs2017.vcxproj
+++ b/Testing/GoogleTest/UnitTests/UnitTests.vs2017.vcxproj
@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{733E7C0B-AC3D-47AC-A8DA-E13644D6294D}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
     <ProjectName>UnitTests</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
About OSDN
Find Software
Develop Software
Help