From 92af72dfc93a3bdb9002d7b2160ffc62ff626368 Mon Sep 17 00:00:00 2001
From: Eugene Opalev <eugeneopalev@gmail.com>
Date: Mon, 22 Apr 2019 15:01:07 +0500
Subject: Tidy up solutions and projects

---
 win32/VS2015/libogg.sln     |  2 --
 win32/VS2015/libogg.vcxproj | 10 +++++-----
 win32/VS2017/libogg.sln     | 39 +++++++++++++++++----------------------
 win32/VS2017/libogg.vcxproj | 13 ++++++-------
 win32/VS2019/libogg.sln     | 39 +++++++++++++++++----------------------
 win32/VS2019/libogg.vcxproj | 11 +++++------
 6 files changed, 50 insertions(+), 64 deletions(-)

diff --git a/win32/VS2015/libogg.sln b/win32/VS2015/libogg.sln
index fbf31f4..7e2984b 100644
--- a/win32/VS2015/libogg.sln
+++ b/win32/VS2015/libogg.sln
@@ -1,7 +1,5 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "libogg.vcxproj", "{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}"
 EndProject
diff --git a/win32/VS2015/libogg.vcxproj b/win32/VS2015/libogg.vcxproj
index b1eddc9..27c1c0d 100644
--- a/win32/VS2015/libogg.vcxproj
+++ b/win32/VS2015/libogg.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugDLL|Win32">
       <Configuration>DebugDLL</Configuration>
@@ -148,8 +148,8 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <OmitDefaultLibName>true</OmitDefaultLibName>
       <Optimization>Disabled</Optimization>
-      <WarningLevel>Level4</WarningLevel>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
@@ -177,8 +177,8 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <OmitDefaultLibName>true</OmitDefaultLibName>
       <Optimization>Disabled</Optimization>
-      <WarningLevel>Level4</WarningLevel>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
@@ -209,8 +209,8 @@
       <OmitDefaultLibName>true</OmitDefaultLibName>
       <Optimization>MaxSpeed</Optimization>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level4</WarningLevel>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -250,8 +250,8 @@
       <OmitDefaultLibName>true</OmitDefaultLibName>
       <Optimization>MaxSpeed</Optimization>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level4</WarningLevel>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/win32/VS2017/libogg.sln b/win32/VS2017/libogg.sln
index a32bc1f..7e2984b 100644
--- a/win32/VS2017/libogg.sln
+++ b/win32/VS2017/libogg.sln
@@ -1,9 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.489
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "libogg.vcxproj", "{D55171D6-645F-4044-975F-80859064BE57}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "libogg.vcxproj", "{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,27 +15,24 @@ Global
 		ReleaseDLL|x86 = ReleaseDLL|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D55171D6-645F-4044-975F-80859064BE57}.Debug|x64.ActiveCfg = Debug|x64
-		{D55171D6-645F-4044-975F-80859064BE57}.Debug|x64.Build.0 = Debug|x64
-		{D55171D6-645F-4044-975F-80859064BE57}.Debug|x86.ActiveCfg = Debug|Win32
-		{D55171D6-645F-4044-975F-80859064BE57}.Debug|x86.Build.0 = Debug|Win32
-		{D55171D6-645F-4044-975F-80859064BE57}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
-		{D55171D6-645F-4044-975F-80859064BE57}.DebugDLL|x64.Build.0 = DebugDLL|x64
-		{D55171D6-645F-4044-975F-80859064BE57}.DebugDLL|x86.ActiveCfg = DebugDLL|Win32
-		{D55171D6-645F-4044-975F-80859064BE57}.DebugDLL|x86.Build.0 = DebugDLL|Win32
-		{D55171D6-645F-4044-975F-80859064BE57}.Release|x64.ActiveCfg = Release|x64
-		{D55171D6-645F-4044-975F-80859064BE57}.Release|x64.Build.0 = Release|x64
-		{D55171D6-645F-4044-975F-80859064BE57}.Release|x86.ActiveCfg = Release|Win32
-		{D55171D6-645F-4044-975F-80859064BE57}.Release|x86.Build.0 = Release|Win32
-		{D55171D6-645F-4044-975F-80859064BE57}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
-		{D55171D6-645F-4044-975F-80859064BE57}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
-		{D55171D6-645F-4044-975F-80859064BE57}.ReleaseDLL|x86.ActiveCfg = ReleaseDLL|Win32
-		{D55171D6-645F-4044-975F-80859064BE57}.ReleaseDLL|x86.Build.0 = ReleaseDLL|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Debug|x64.ActiveCfg = Debug|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Debug|x64.Build.0 = Debug|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Debug|x86.ActiveCfg = Debug|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Debug|x86.Build.0 = Debug|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.DebugDLL|x64.Build.0 = DebugDLL|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.DebugDLL|x86.ActiveCfg = DebugDLL|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.DebugDLL|x86.Build.0 = DebugDLL|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Release|x64.ActiveCfg = Release|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Release|x64.Build.0 = Release|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Release|x86.ActiveCfg = Release|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Release|x86.Build.0 = Release|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.ReleaseDLL|x86.ActiveCfg = ReleaseDLL|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.ReleaseDLL|x86.Build.0 = ReleaseDLL|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E268B15E-DCF8-45E0-8EAC-8DD75BC0C041}
-	EndGlobalSection
 EndGlobal
diff --git a/win32/VS2017/libogg.vcxproj b/win32/VS2017/libogg.vcxproj
index 42e0ab4..f63e98a 100644
--- a/win32/VS2017/libogg.vcxproj
+++ b/win32/VS2017/libogg.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugDLL|Win32">
       <Configuration>DebugDLL</Configuration>
@@ -35,8 +35,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{D55171D6-645F-4044-975F-80859064BE57}</ProjectGuid>
+    <ProjectGuid>{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}</ProjectGuid>
     <RootNamespace>libogg</RootNamespace>
     <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
@@ -148,8 +147,8 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <OmitDefaultLibName>true</OmitDefaultLibName>
       <Optimization>Disabled</Optimization>
-      <WarningLevel>Level4</WarningLevel>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
@@ -175,8 +174,8 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <OmitDefaultLibName>true</OmitDefaultLibName>
       <Optimization>Disabled</Optimization>
-      <WarningLevel>Level4</WarningLevel>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
@@ -205,8 +204,8 @@
       <OmitDefaultLibName>true</OmitDefaultLibName>
       <Optimization>MaxSpeed</Optimization>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level4</WarningLevel>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -244,8 +243,8 @@
       <OmitDefaultLibName>true</OmitDefaultLibName>
       <Optimization>MaxSpeed</Optimization>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level4</WarningLevel>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/win32/VS2019/libogg.sln b/win32/VS2019/libogg.sln
index 2e99fd2..7e2984b 100644
--- a/win32/VS2019/libogg.sln
+++ b/win32/VS2019/libogg.sln
@@ -1,9 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "libogg.vcxproj", "{C8F644C8-2046-4551-AAF0-A991C6B5636A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "libogg.vcxproj", "{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,27 +15,24 @@ Global
 		ReleaseDLL|x86 = ReleaseDLL|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.Debug|x64.ActiveCfg = Debug|x64
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.Debug|x64.Build.0 = Debug|x64
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.Debug|x86.ActiveCfg = Debug|Win32
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.Debug|x86.Build.0 = Debug|Win32
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.DebugDLL|x64.Build.0 = DebugDLL|x64
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.DebugDLL|x86.ActiveCfg = DebugDLL|Win32
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.DebugDLL|x86.Build.0 = DebugDLL|Win32
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.Release|x64.ActiveCfg = Release|x64
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.Release|x64.Build.0 = Release|x64
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.Release|x86.ActiveCfg = Release|Win32
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.Release|x86.Build.0 = Release|Win32
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.ReleaseDLL|x86.ActiveCfg = ReleaseDLL|Win32
-		{C8F644C8-2046-4551-AAF0-A991C6B5636A}.ReleaseDLL|x86.Build.0 = ReleaseDLL|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Debug|x64.ActiveCfg = Debug|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Debug|x64.Build.0 = Debug|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Debug|x86.ActiveCfg = Debug|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Debug|x86.Build.0 = Debug|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.DebugDLL|x64.ActiveCfg = DebugDLL|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.DebugDLL|x64.Build.0 = DebugDLL|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.DebugDLL|x86.ActiveCfg = DebugDLL|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.DebugDLL|x86.Build.0 = DebugDLL|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Release|x64.ActiveCfg = Release|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Release|x64.Build.0 = Release|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Release|x86.ActiveCfg = Release|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.Release|x86.Build.0 = Release|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.ReleaseDLL|x64.ActiveCfg = ReleaseDLL|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.ReleaseDLL|x64.Build.0 = ReleaseDLL|x64
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.ReleaseDLL|x86.ActiveCfg = ReleaseDLL|Win32
+		{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}.ReleaseDLL|x86.Build.0 = ReleaseDLL|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {88692399-3691-4740-939B-1A339B331BE8}
-	EndGlobalSection
 EndGlobal
diff --git a/win32/VS2019/libogg.vcxproj b/win32/VS2019/libogg.vcxproj
index 07601e4..d2edcc3 100644
--- a/win32/VS2019/libogg.vcxproj
+++ b/win32/VS2019/libogg.vcxproj
@@ -35,8 +35,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <ProjectGuid>{C8F644C8-2046-4551-AAF0-A991C6B5636A}</ProjectGuid>
+    <ProjectGuid>{AFF27A26-C088-444B-BC2A-0BA94A02AFA7}</ProjectGuid>
     <RootNamespace>libogg</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
@@ -148,8 +147,8 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <OmitDefaultLibName>true</OmitDefaultLibName>
       <Optimization>Disabled</Optimization>
-      <WarningLevel>Level4</WarningLevel>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
@@ -175,8 +174,8 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <OmitDefaultLibName>true</OmitDefaultLibName>
       <Optimization>Disabled</Optimization>
-      <WarningLevel>Level4</WarningLevel>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
@@ -205,8 +204,8 @@
       <OmitDefaultLibName>true</OmitDefaultLibName>
       <Optimization>MaxSpeed</Optimization>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level4</WarningLevel>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -244,8 +243,8 @@
       <OmitDefaultLibName>true</OmitDefaultLibName>
       <Optimization>MaxSpeed</Optimization>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <WarningLevel>Level4</WarningLevel>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WarningLevel>Level4</WarningLevel>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
-- 
cgit v1.2.1