From 165a6a55eccd22affa5dcf73537e6b91d0073fea Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Mon, 28 Dec 2015 12:59:09 -0800 Subject: [PATCH 1/2] - testing --- mk/windoze/Glest_vc2015.sln | 12 +++++++++++- mk/windoze/vc2015/glest_game.vcxproj | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mk/windoze/Glest_vc2015.sln b/mk/windoze/Glest_vc2015.sln index 52bfeabd..6778091c 100644 --- a/mk/windoze/Glest_vc2015.sln +++ b/mk/windoze/Glest_vc2015.sln @@ -1,6 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2012 for Windows Desktop +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g2xml", "vc2015\g2xml.vcxproj", "{407355A4-D12A-4E3B-A7EB-A835E573B376}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml2g", "vc2015\xml2g.vcxproj", "{3BAC3FE8-1CC4-487D-802A-E0A04B39BB6A}" @@ -20,7 +22,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "megaglest_tests", "vc2015\m EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstreflop", "vc2015\libstreflop.vcxproj", "{CDF4DDB9-945E-4D0D-9F0E-2BBEB5D22141}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{03F699FB-E7F4-4C26-9858-AAEC77D65E35}" + ProjectSection(SolutionItems) = preProject + Performance1.psess = Performance1.psess + EndProjectSection +EndProject Global + GlobalSection(Performance) = preSolution + HasPerformanceSessions = true + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 diff --git a/mk/windoze/vc2015/glest_game.vcxproj b/mk/windoze/vc2015/glest_game.vcxproj index 940e7897..8e3937bc 100644 --- a/mk/windoze/vc2015/glest_game.vcxproj +++ b/mk/windoze/vc2015/glest_game.vcxproj @@ -285,6 +285,7 @@ + true @@ -385,6 +386,7 @@ + true From 721c48036b474f29322a01f5fc15673c9e99683d Mon Sep 17 00:00:00 2001 From: SoftCoder Date: Mon, 28 Dec 2015 17:57:47 -0800 Subject: [PATCH 2/2] - upgraded msvc to v2015 sp1 --- mk/windoze/Glest_vc2015.sln | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/windoze/Glest_vc2015.sln b/mk/windoze/Glest_vc2015.sln index 6778091c..e022b7dc 100644 --- a/mk/windoze/Glest_vc2015.sln +++ b/mk/windoze/Glest_vc2015.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g2xml", "vc2015\g2xml.vcxproj", "{407355A4-D12A-4E3B-A7EB-A835E573B376}" EndProject