diff options
| -rw-r--r-- | src/GvimExt/Makefile | 10 | ||||
| -rw-r--r-- | src/Make_mvc.mak | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 21 insertions, 0 deletions
diff --git a/src/GvimExt/Makefile b/src/GvimExt/Makefile index 975ba11705..4b83f52dd5 100644 --- a/src/GvimExt/Makefile +++ b/src/GvimExt/Makefile @@ -10,6 +10,9 @@ TARGETOS = WINNT !ifndef APPVER APPVER = 5.01 !endif +!ifndef WINVER +WINVER = 0x0501 +!endif !if "$(DEBUG)" != "yes" NODEBUG = 1 @@ -53,6 +56,13 @@ olelibsdll = ole32.lib uuid.lib oleaut32.lib user32.lib gdi32.lib advapi32.lib # include CPUARG cflags = $(cflags) $(CPUARG) +# set WINVER and _WIN32_WINNT +cflags = $(cflags) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) + +!if "$(CL)" == "/D_USING_V110_SDK71_" +rcflags = $(rcflags) /D_USING_V110_SDK71_ +!endif + SUBSYSTEM = console !if "$(SUBSYSTEM_VER)" != "" SUBSYSTEM = $(SUBSYSTEM),$(SUBSYSTEM_VER) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index b95e936f06..da9a911d0a 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -626,6 +626,12 @@ NODEFAULTLIB = NODEFAULTLIB = /nodefaultlib !endif +# Specify source code charset to suppress warning C4819 on non-English +# environment. Only available from MSVC 14. +!if $(MSVC_MAJOR) >= 14 +CFLAGS = $(CFLAGS) /source-charset:utf-8 +!endif + # Use multiprocess build on MSVC 10 !if ("$(USE_MP)" == "yes") && ($(MSVC_MAJOR) >= 10) CFLAGS = $(CFLAGS) /MP @@ -669,6 +675,9 @@ CFLAGS = $(CFLAGS) $(WP64CHECK) CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG) RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG +! if "$(CL)" == "/D_USING_V110_SDK71_" +RCFLAGS = $(RCFLAGS) /D_USING_V110_SDK71_ +! endif ! ifdef USE_MSVCRT CFLAGS = $(CFLAGS) /MD LIBC = msvcrt.lib diff --git a/src/version.c b/src/version.c index ba79618268..7c31c195da 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 249, +/**/ 248, /**/ 247, |