From 12778e7e424cd71b1b2069a9a1913d394fd6e2e0 Mon Sep 17 00:00:00 2001
From: Laurent Perron <lperron@corp.google.com>
Date: Sat, 22 Jun 2019 23:25:49 +0200
Subject: [PATCH] more work on vs 2019

---
 makefiles/Makefile.port.mk | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/makefiles/Makefile.port.mk b/makefiles/Makefile.port.mk
index 634f69774d..fe1c828453 100755
--- a/makefiles/Makefile.port.mk
+++ b/makefiles/Makefile.port.mk
@@ -117,12 +117,13 @@ ifeq ($(SYSTEM),win)
     VISUAL_STUDIO_YEAR = 2017
     VISUAL_STUDIO_MAJOR = 15
     VS_RELEASE = v141
-    CMAKE_SUFFIX = Win64
+    CMAKE_PLATFORM = "Visual Studio 15 2019 Win64"
   else
     ifeq ("$(VisualStudioVersion)","16.0")
       VISUAL_STUDIO_YEAR = 2019
       VISUAL_STUDIO_MAJOR = 16
       VS_RELEASE = v142
+      CMAKE_PLATFORM = "Visual Studio 16 2019" -A x64
     else
       $(warning "Unrecognized visual studio version")
     endif
@@ -137,12 +138,6 @@ ifeq ($(SYSTEM),win)
   PORT = VisualStudio$(VISUAL_STUDIO_YEAR)-$(PTRLENGTH)bit
   VS_COMTOOLS = $(VISUAL_STUDIO_MAJOR)0
 
-  ifeq ("$(CMAKE_SUFFIX)","")
-    CMAKE_PLATFORM = "Visual Studio $(VISUAL_STUDIO_MAJOR) $(VISUAL_STUDIO_YEAR)"
-  else
-    CMAKE_PLATFORM = "Visual Studio $(VISUAL_STUDIO_MAJOR) $(VISUAL_STUDIO_YEAR) $(CMAKE_SUFFIX)"
-  endif
-
   # Third party specific
   CBC_PLATFORM = $(CBC_PLATFORM_PREFIX)-$(VS_RELEASE)-Release