[Libreoffice-commits] core.git: bin/gbuild-to-ide Makefile.in

[Michael Stahl]

 Makefile.in       |    2 +-
 bin/gbuild-to-ide |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 999499ab25df8b293c009ddfa2e0bedbe5e6ce3d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Sep 14 13:44:27 2016 +0200

    gbuild-to-ide: MSVC 2012 no longer supported, replace with 2015
    
    Of course not tested in any way but with any luck the project file
    format hasn't changed and it will "just work".
    
    Change-Id: I81c5043259feeabd69ef31ea7ef160901ac7ebdc

diff --git a/Makefile.in b/Makefile.in
index 5a21a51..15bbf4b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -421,8 +421,8 @@ endef
 $(foreach ide,\
 	debug \
 	kdevelop \
-	vs2012 \
 	vs2013 \
+	vs2015 \
 	vim \
 	xcode \
 	qtcreator \
diff --git a/bin/gbuild-to-ide b/bin/gbuild-to-ide
index 0492920..069b7c5f 100755
--- a/bin/gbuild-to-ide
+++ b/bin/gbuild-to-ide
@@ -833,7 +833,7 @@ class VisualStudioIntegrationGenerator(IdeIntegrationGenerator):
         }
 
     def retrieve_toolset(self, ide):
-        ide_toolset_map = {'vs2012': 'v110', 'vs2013': 'v120'}
+        ide_toolset_map = {'vs2013': 'v120', 'vs2015': 'v140'}
         return ide_toolset_map[ide]
 
     def module_make_command(self, targets):
@@ -1705,8 +1705,8 @@ if __name__ == '__main__':
         'eclipsecdt': EclipseCDTIntegrationGenerator,
         'kdevelop': KdevelopIntegrationGenerator,
         'xcode': XcodeIntegrationGenerator,
-        'vs2012': VisualStudioIntegrationGenerator,
         'vs2013': VisualStudioIntegrationGenerator,
+        'vs2015': VisualStudioIntegrationGenerator,
         'vim': VimIntegrationGenerator,
         'debug': DebugIntegrationGenerator,
         'qtcreator': QtCreatorIntegrationGenerator,