Commit 6cc79dc7 authored by Steve Holme's avatar Steve Holme
Browse files

config-win32: Fixed build targets for the VS2012+ Windows XP toolset 

Even though commit 23e70e1c mentioned the v110_xp toolset, I had
forgotten to include the relevant pre-processor definitions.
parent 62a6230e

lib/config-win32.h

+18 −5
Original line number Diff line number Diff line
@@ -514,15 +514,24 @@ 


   /* The minimum build target for VS2012 is Vista unless Update 1 is installed

      and the v110_xp toolset is choosen. */

#  if defined(_USING_V110_SDK71_)

#    define VS2012_MIN_TARGET 0x0501

#  else

#    define VS2012_MIN_TARGET 0x0600

#  endif



   /* VS2008 default build target is Windows Vista. We override default target

      to be Windows XP. */

#  define VS2008_DEF_TARGET 0x0501



   /* VS2012 default build target is Windows Vista. */

   /* VS2012 default build target is Windows Vista unless Update 1 is installed

      and the v110_xp toolset is choosen. */

#  if defined(_USING_V110_SDK71_)

#    define VS2012_DEF_TARGET 0x0501

#  else

#    define VS2012_DEF_TARGET 0x0600

#  endif

#endif



/* VS2008 default target settings and minimum build target check. */

#if defined(_MSC_VER) && (_MSC_VER >= 1500) && (_MSC_VER <= 1600)
@@ -546,9 +555,13 @@ 
#    define WINVER VS2012_DEF_TARGET

#  endif

#  if (_WIN32_WINNT < VS2012_MIN_TARGET) || (WINVER < VS2012_MIN_TARGET)

#    if defined(_USING_V110_SDK71_)

#      error VS2012 does not support Windows build targets prior to Windows XP

#    else

#      error VS2012 does not support Windows build targets prior to Windows Vista

#    endif

#  endif

#endif



/* When no build target is specified Pelles C 5.00 and later default build

   target is Windows Vista. We override default target to be Windows 2000. */