diff --git a/makefile b/makefile index 91ecd5224..316149368 100644 --- a/makefile +++ b/makefile @@ -27,8 +27,8 @@ BUILD_X86_ASM = 1 # Build for x64 targets (MinGW64 and MSVC only, this will undefine BUILD_A68K and BUILD_X86_ASM) #BUILD_X64_EXE = 1 -# Build for Windows XP target (for use with Visual Studio 2012) -#BUILD_VS2012_XP_TARGET = 1 +# Build for Windows XP target (for use with Visual Studio 2012-13) +#BUILD_VS_XP_TARGET = 1 # Include 7-zip support INCLUDE_7Z_SUPPORT = 1 diff --git a/makefile.vc b/makefile.vc index 5e9771e3e..a7d95ce38 100644 --- a/makefile.vc +++ b/makefile.vc @@ -58,7 +58,7 @@ ifndef UNICODE NAME := $(NAME)a COMPILENAME := $(COMPILENAME)a endif -ifdef BUILD_VS2012_XP_TARGET +ifdef BUILD_VS_XP_TARGET NAME := $(NAME)xp endif @@ -219,8 +219,8 @@ ifdef BUILD_X64_EXE DEF := $(DEF) /DBUILD_X64_EXE endif -ifdef BUILD_VS2012_XP_TARGET - DEF := $(DEF) /DBUILD_VS2012_XP_TARGET +ifdef BUILD_VS_XP_TARGET + DEF := $(DEF) /DBUILD_VS_XP_TARGET endif ifdef SYMBOL @@ -240,7 +240,7 @@ else LDFLAGS += /LTCG:STATUS endif -ifdef BUILD_VS2012_XP_TARGET +ifdef BUILD_VS_XP_TARGET CFLAGS += /D_USING_V110_SDK71_ LDFLAGS += /SUBSYSTEM:WINDOWS,5.01 endif diff --git a/src/burner/win32/scrn.cpp b/src/burner/win32/scrn.cpp index 4e1ce84d2..c2963ae2a 100644 --- a/src/burner/win32/scrn.cpp +++ b/src/burner/win32/scrn.cpp @@ -2887,7 +2887,7 @@ int ScrnSize() #if defined _MSC_VER #if _MSC_VER >= 1700 // using the old XP supporting SDK we don't need to alter anything - #if !defined BUILD_VS2012_XP_TARGET + #if !defined BUILD_VS_XP_TARGET ew <<= 1; eh <<= 1; #endif diff --git a/src/dep/scripts/build_details.cpp b/src/dep/scripts/build_details.cpp index 56ad1742c..6ddb03389 100644 --- a/src/dep/scripts/build_details.cpp +++ b/src/dep/scripts/build_details.cpp @@ -31,11 +31,17 @@ int main(int /*argc*/, char** /*argv*/) #elif _MSC_VER >= 1600 && _MSC_VER < 1700 printf("#define BUILD_COMP Visual C++ 2010\n"); #elif _MSC_VER >= 1700 && _MSC_VER < 1800 - #if defined BUILD_VS2012_XP_TARGET + #if defined BUILD_VS_XP_TARGET printf("#define BUILD_COMP Visual C++ 2012 (XP)\n"); #else printf("#define BUILD_COMP Visual C++ 2012\n"); #endif + #elif _MSC_VER >= 1800 && _MSC_VER < 1900 + #if defined BUILD_VS_XP_TARGET + printf("#define BUILD_COMP Visual C++ 2013 (XP)\n"); + #else + printf("#define BUILD_COMP Visual C++ 2013\n"); + #endif #else printf("#define BUILD_COMP Visual C++ %i.%i\n", _MSC_VER / 100 - 6, _MSC_VER % 100 / 10); #endif