Upgrade to Visual Studio 2015

This commit is contained in:
Michael Dirks
2015-12-30 06:41:59 +01:00
parent 44c8254076
commit e58f985491
7 changed files with 13 additions and 17 deletions
+6
View File
@@ -1,4 +1,10 @@
/#Build
/#Intermediate
# Visual Studio Files
*.suo
*.v12.suo
*.sdf
*.opensdf
*.opendb
/.vs
+1 -10
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40418.0
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BlitzSteam", "BlitzSteam\BlitzSteam.vcxproj", "{805CB1EB-82F0-405E-AC0B-03FBE82CC77D}"
ProjectSection(ProjectDependencies) = postProject
@@ -14,11 +14,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BlitzPointer", "BlitzPointe
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Template", "Template\Template.vcxproj", "{EE818249-9F1E-4FB5-A1E0-604BCD9AFF77}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BlitzSQLite", "BlitzSQLite\BlitzSQLite.vcxproj", "{DA0440A3-4F72-44C0-BC27-57D9AA7B29C1}"
ProjectSection(ProjectDependencies) = postProject
{AC8F52F4-9FE6-4CEF-B549-8180757020C8} = {AC8F52F4-9FE6-4CEF-B549-8180757020C8}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -39,10 +34,6 @@ Global
{AC8F52F4-9FE6-4CEF-B549-8180757020C8}.Release|Win32.Build.0 = Release|Win32
{EE818249-9F1E-4FB5-A1E0-604BCD9AFF77}.Debug|Win32.ActiveCfg = Debug|Win32
{EE818249-9F1E-4FB5-A1E0-604BCD9AFF77}.Release|Win32.ActiveCfg = Release|Win32
{DA0440A3-4F72-44C0-BC27-57D9AA7B29C1}.Debug|Win32.ActiveCfg = Debug|Win32
{DA0440A3-4F72-44C0-BC27-57D9AA7B29C1}.Debug|Win32.Build.0 = Debug|Win32
{DA0440A3-4F72-44C0-BC27-57D9AA7B29C1}.Release|Win32.ActiveCfg = Release|Win32
{DA0440A3-4F72-44C0-BC27-57D9AA7B29C1}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Submodule BlitzSQLite deleted from bb3a9e59f1
+3 -3
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -18,13 +18,13 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>