Bye bye VS2010

Change-Id: I9d16f4f0df42ae4b046bc1e4ac4fba95c4b9d785
This commit is contained in:
Tor Lillqvist
2014-09-17 12:29:13 +03:00
parent 6ee5be0e1d
commit e7f8b9f8f5
5 changed files with 12 additions and 41 deletions

View File

@@ -2010,12 +2010,13 @@ AC_ARG_WITH(
[with_doxygen=yes]) [with_doxygen=yes])
AC_ARG_WITH(visual-studio, AC_ARG_WITH(visual-studio,
AS_HELP_STRING([--with-visual-studio=<2013/2012/2010>], AS_HELP_STRING([--with-visual-studio=<2013/2012>],
[Specify which Visual Studio version to use in case several are [Specify which Visual Studio version to use in case several are
are installed. If not specified, the order of preference is are installed. If not specified, the order of preference is
2013, 2012, 2010 (including Express editions).]) 2013, 2012 (including Express editions). Note that it is
unclear whether using 2013 actually works as intended.])
[ [
Usage: --with-visual-studio=<2013/2012/2010> Usage: --with-visual-studio=<2013/2012>
], ],
,) ,)
@@ -3381,8 +3382,6 @@ map_vs_year_to_version()
unset vsversion unset vsversion
case $1 in case $1 in
2010)
vsversion=10.0;;
2012) 2012)
vsversion=11.0;; vsversion=11.0;;
2013) 2013)
@@ -3403,14 +3402,14 @@ vs_versions_to_check()
map_vs_year_to_version "$1" map_vs_year_to_version "$1"
vsversions=$vsversion vsversions=$vsversion
else else
# By default we prefer 2013, 2012, then 2010 # By default we prefer 2013, then 2012
vsversions="12.0 11.0 10.0" vsversions="12.0 11.0"
fi fi
} }
find_msvs() find_msvs()
{ {
# Find Visual Studio 2013/2012/2010 # Find Visual Studio 2013/2012
# Args: $1 (optional) : versions to check, in the order of preference # Args: $1 (optional) : versions to check, in the order of preference
# Return value: $vstest # Return value: $vstest
@@ -3434,7 +3433,7 @@ find_msvs()
find_msvc() find_msvc()
{ {
# Find Visual C++ 2013/2012/2010 # Find Visual C++ 2013/2012
# Args: $1 (optional) : The VS version year # Args: $1 (optional) : The VS version year
# Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot # Return values: $vctest, $vcyear, $vcnum, $vcnumwithdot
@@ -3457,10 +3456,6 @@ find_msvc()
if test -n "$vctest"; then if test -n "$vctest"; then
vcnumwithdot=$ver vcnumwithdot=$ver
case "$vcnumwithdot" in case "$vcnumwithdot" in
10.0)
vcyear=2010
vcnum=100
;;
11.0) 11.0)
vcyear=2012 vcyear=2012
vcnum=110 vcnum=110
@@ -3484,7 +3479,7 @@ if test "$_os" = "WINNT"; then
if test -n "$with_visual_studio"; then if test -n "$with_visual_studio"; then
AC_MSG_ERROR([No Visual Studio $with_visual_studio installation found]) AC_MSG_ERROR([No Visual Studio $with_visual_studio installation found])
else else
AC_MSG_ERROR([No Visual Studio 2012, 2010 or 2013 installation found]) AC_MSG_ERROR([No Visual Studio 2012 or 2013 installation found])
fi fi
fi fi
@@ -3566,7 +3561,7 @@ if test "$_os" = "WINNT"; then
COMPATH=`echo $VC_PRODUCT_DIR` COMPATH=`echo $VC_PRODUCT_DIR`
fi fi
fi fi
if test "$BITNESS_OVERRIDE" = "" -a "$vcnum" != "100"; then if test "$BITNESS_OVERRIDE" = ""; then
CC="$CC -arch:SSE" # MSVC 2012 default for x86 is -arch:SSE2 CC="$CC -arch:SSE" # MSVC 2012 default for x86 is -arch:SSE2
fi fi
export INCLUDE=`cygpath -d "$COMPATH/Include"` export INCLUDE=`cygpath -d "$COMPATH/Include"`
@@ -3581,14 +3576,6 @@ if test "$_os" = "WINNT"; then
# are always "better", we list them in reverse chronological order. # are always "better", we list them in reverse chronological order.
case $vcnum in case $vcnum in
100)
COMEX=13
WINDOWS_SDK_ACCEPTABLE_VERSIONS="7.1A 7.1 7.0A 6.0A"
if test "$ENABLE_LTO" = TRUE; then
AC_MSG_WARN([LTO is known to cause problems with MSVC 2010])
add_warning "LTO is known to cause problems with MSVC 2010"
fi
;;
110) 110)
COMEX=14 COMEX=14
WINDOWS_SDK_ACCEPTABLE_VERSIONS="8.0 7.1A" WINDOWS_SDK_ACCEPTABLE_VERSIONS="8.0 7.1A"

View File

@@ -19,7 +19,6 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) :
MSBuild.exe CoinMP.sln /t:Build \ MSBuild.exe CoinMP.sln /t:Build \
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=Win32 \ /p:Platform=Win32 \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 /p:VisualStudioVersion=10.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) /p:VisualStudioVersion=11.0) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \ $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
,CoinMP/MSVisualStudio/v9) ,CoinMP/MSVisualStudio/v9)

View File

@@ -46,8 +46,6 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \ $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 /p:VisualStudioVersion=12.0 /ToolsVersion:12.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \ /p:VisualStudioVersion=11.0) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
/p:VisualStudioVersion=10.0) \
'/p:AdditionalIncludeDirectories=$(subst $(WHITESPACE),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes))))' \ '/p:AdditionalIncludeDirectories=$(subst $(WHITESPACE),;,$(subst /,\,$(strip $(libgltf_AdditionalIncludes))))' \
/p:AdditionalLibraryDirectories=$(if $(SYSTEM_GLEW),,"$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32") \ /p:AdditionalLibraryDirectories=$(if $(SYSTEM_GLEW),,"$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32") \
,build/win32) ,build/win32)

View File

@@ -35,8 +35,6 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build \ MAKEFLAGS= MSBuild.exe pcbuild.sln /t:Build \
/p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \ /p:Configuration=$(if $(MSVC_USE_DEBUG_RUNTIME),Debug,Release) \
/p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \ /p:Platform=$(if $(filter INTEL,$(CPUNAME)),Win32,x64) \
$(if $(filter 100,$(VCVER)),/p:PlatformToolset=v100 \
/p:VisualStudioVersion=10.0) \
$(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \ $(if $(filter 110,$(VCVER)),/p:PlatformToolset=$(if $(filter 80,$(WINDOWS_SDK_VERSION)),v110,v110_xp) \
/p:VisualStudioVersion=11.0) \ /p:VisualStudioVersion=11.0) \
$(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 \ $(if $(filter 120,$(VCVER)),/p:PlatformToolset=v120 \

View File

@@ -202,9 +202,9 @@ ifneq ($(ENABLE_LTO),)
# the dbaccess dbu library. Let's try globally disabling C4702. # the dbaccess dbu library. Let's try globally disabling C4702.
# Might be fixed in VS2013 though? # Might be fixed in VS2013 though?
# VCVER=100 for VS2010 and VCVER=110 for VS2012 # VCVER=110 for VS2012
ifneq ($(filter 100 110,$(VCVER)),) ifneq ($(filter 110,$(VCVER)),)
gb_CXXFLAGS += \ gb_CXXFLAGS += \
-wd4702 \ -wd4702 \
@@ -212,15 +212,6 @@ endif
endif endif
# New warning(s) in Visual Studio 2010, let's try disabling these only
# for that specific compiler version, in case a later one will not
# need them disabled.
ifeq ($(VCVER),100)
# (none currently)
endif
ifeq ($(CPUNAME),X86_64) ifeq ($(CPUNAME),X86_64)
gb_CXXFLAGS += \ gb_CXXFLAGS += \
@@ -228,10 +219,8 @@ gb_CXXFLAGS += \
endif endif
ifneq ($(VCVER),100)
# rc.exe does not support -nologo in 6.1.6723.1 that is in the Windows SDK 6.0A # rc.exe does not support -nologo in 6.1.6723.1 that is in the Windows SDK 6.0A
gb_RCFLAGS += -nologo gb_RCFLAGS += -nologo
endif
# C4005: 'identifier' : macro redefinition # C4005: 'identifier' : macro redefinition