common/autoconf/toolchain_windows.m4

*** 23,33 ****
  # questions.
  #
  
  ################################################################################
  # The order of these defines the priority by which we try to find them.
! VALID_VS_VERSIONS="2013 2012 2010"
  
  VS_DESCRIPTION_2010="Microsoft Visual Studio 2010"
  VS_VERSION_INTERNAL_2010=100
  VS_MSVCR_2010=msvcr100.dll
  # We don't use msvcp on Visual Studio 2010
--- 23,33 ----
  # questions.
  #
  
  ################################################################################
  # The order of these defines the priority by which we try to find them.
! VALID_VS_VERSIONS="2015 2013 2012 2010"
  
  VS_DESCRIPTION_2010="Microsoft Visual Studio 2010"
  VS_VERSION_INTERNAL_2010=100
  VS_MSVCR_2010=msvcr100.dll
  # We don't use msvcp on Visual Studio 2010
*** 56,65 ****
--- 56,75 ----
  VS_VS_INSTALLDIR_2013="Microsoft Visual Studio 12.0"
  VS_SDK_INSTALLDIR_2013=
  VS_VS_PLATFORM_NAME_2013="v120"
  VS_SDK_PLATFORM_NAME_2013=
  
+ VS_DESCRIPTION_2015="Microsoft Visual Studio 2015"
+ VS_VERSION_INTERNAL_2015=140
+ VS_MSVCR_2015=vcruntime140.dll
+ VS_MSVCP_2015=msvcp140.dll
+ VS_ENVVAR_2015="VS140COMNTOOLS"
+ VS_VS_INSTALLDIR_2015="Microsoft Visual Studio 14.0"
+ VS_SDK_INSTALLDIR_2015=
+ VS_VS_PLATFORM_NAME_2015="v140"
+ VS_SDK_PLATFORM_NAME_2015=
+ 
  ################################################################################
  
  AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
  [
    if test "x$VS_ENV_CMD" = x; then
*** 77,87 ****
      if test -d "$VS_BASE"; then
        if test -f "$VS_BASE/$VCVARSFILE"; then
          AC_MSG_NOTICE([Found Visual Studio installation at $VS_BASE using $METHOD])
          VS_ENV_CMD="$VS_BASE/$VCVARSFILE"
          # PLATFORM_TOOLSET is used during the compilation of the freetype sources (see
!         # 'LIB_BUILD_FREETYPE' in libraries.m4) and must be one of 'v100', 'v110' or 'v120' for VS 2010, 2012 or VS2013
          eval PLATFORM_TOOLSET="\${VS_VS_PLATFORM_NAME_${VS_VERSION}}"
        else
          AC_MSG_NOTICE([Found Visual Studio installation at $VS_BASE using $METHOD])
          AC_MSG_NOTICE([Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring])
        fi
--- 87,97 ----
      if test -d "$VS_BASE"; then
        if test -f "$VS_BASE/$VCVARSFILE"; then
          AC_MSG_NOTICE([Found Visual Studio installation at $VS_BASE using $METHOD])
          VS_ENV_CMD="$VS_BASE/$VCVARSFILE"
          # PLATFORM_TOOLSET is used during the compilation of the freetype sources (see
!         # 'LIB_BUILD_FREETYPE' in libraries.m4) and must be one of 'v100', 'v110', 'v120' or 'v140' for VS 2010, 2012, 2013 or VS2015
          eval PLATFORM_TOOLSET="\${VS_VS_PLATFORM_NAME_${VS_VERSION}}"
        else
          AC_MSG_NOTICE([Found Visual Studio installation at $VS_BASE using $METHOD])
          AC_MSG_NOTICE([Warning: $VCVARSFILE is missing, this is probably Visual Studio Express. Ignoring])
        fi