diff options
| -rw-r--r-- | src/Make_mvc.mak | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 028277a108..639ae2f893 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -222,8 +222,12 @@ CPU = i386 ! endif ! else # !CPU CPU = i386 -! if !defined(PLATFORM) && defined(TARGET_CPU) +! ifndef PLATFORM +! ifdef TARGET_CPU PLATFORM = $(TARGET_CPU) +! elseif defined(VSCMD_ARG_TGT_ARCH) +PLATFORM = $(VSCMD_ARG_TGT_ARCH) +! endif ! endif ! ifdef PLATFORM ! if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64") diff --git a/src/version.c b/src/version.c index 50f6709b26..19f0692dba 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 857, +/**/ 856, /**/ 855, |