always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more work on vs 2019

Browse Source
This commit is contained in:
Laurent Perron
2019-06-22 23:25:49 +02:00
parent 2f7048d189
commit 12778e7e42
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
makefiles/Makefile.port.mk
View File

@@ -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