Navigation Menu

Skip to content

Commit

Permalink
config-win32: Fixed build targets for the VS2012+ Windows XP toolset
Browse files Browse the repository at this point in the history
Even though commit 23e70e1 mentioned the v110_xp toolset, I had
forgotten to include the relevant pre-processor definitions.
  • Loading branch information
captain-caveman2k committed Nov 17, 2014
1 parent 62a6230 commit 6cc79dc
Showing 1 changed file with 18 additions and 5 deletions.
23 changes: 18 additions & 5 deletions lib/config-win32.h
Expand Up @@ -514,14 +514,23 @@

/* The minimum build target for VS2012 is Vista unless Update 1 is installed
and the v110_xp toolset is choosen. */
# define VS2012_MIN_TARGET 0x0600
# 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
# define VS2008_DEF_TARGET 0x0501

/* VS2012 default build target is Windows Vista. */
# define VS2012_DEF_TARGET 0x0600
/* 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. */
Expand All @@ -546,7 +555,11 @@
# define WINVER VS2012_DEF_TARGET
# endif
# if (_WIN32_WINNT < VS2012_MIN_TARGET) || (WINVER < VS2012_MIN_TARGET)
# error VS2012 does not support Windows build targets prior to Windows Vista
# 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

Expand Down

0 comments on commit 6cc79dc

Please sign in to comment.