Merge pull request #5 from kobake/revert-3-v141-to-v142

Revert "Visual Studio 環境を更新: v141 (VS 2017) -> v142 (VS 2019)"
kobake · Jun 27, 2020 · 6ff6b33 · 6ff6b33
2 parents ddeea94 + 2c28676
commit 6ff6b33
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/locate32/locate32.vcxproj b/locate32/locate32.vcxproj
@@ -14,19 +14,19 @@
     <ProjectGuid>{A819BA18-10E0-46C7-B0C1-E58B084B1822}</ProjectGuid>
     <RootNamespace>locate32</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

diff --git a/mlocate32.sln b/mlocate32.sln
@@ -1,8 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30204.135
-MinimumVisualStudioVersion = 10.0.40219.1
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "locate32", "locate32\locate32.vcxproj", "{A819BA18-10E0-46C7-B0C1-E58B084B1822}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "updatedb32", "updatedb32\updatedb32.vcxproj", "{77EF8CCE-EADB-4EDE-8A52-938E422ADDA2}"
@@ -41,7 +39,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {72D20400-C63B-4954-950A-538579D4483A}
-	EndGlobalSection
 EndGlobal
diff --git a/updatedb32/src/main.cpp b/updatedb32/src/main.cpp
@@ -7,7 +7,6 @@
 #include <algorithm> //sort
 #include <map>
 #include "stream.h"
-#include <locale.h>
 using namespace std;
 
 int main_routine();

diff --git a/updatedb32/updatedb32.vcxproj b/updatedb32/updatedb32.vcxproj
@@ -14,19 +14,19 @@
     <ProjectGuid>{77EF8CCE-EADB-4EDE-8A52-938E422ADDA2}</ProjectGuid>
     <RootNamespace>updatedb32</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">