diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-02-12 21:15:43 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-02-12 21:15:43 +0100 |
| commit | 2f189750887636fecd440d7ef353d9224e48713f (patch) | |
| tree | 83c7cad211df84723e00796ee033739fbccd78c1 /src/Make_mvc.mak | |
| parent | 3b0ef8cfdbb6cb5a9cb2dc093132b78d7a52c667 (diff) | |
| download | vim-git-2f189750887636fecd440d7ef353d9224e48713f.tar.gz | |
patch 8.2.0248: MS-Windows: dealing with deprecation is too complicatedv8.2.0248
Problem: MS-Windows: dealing with deprecation is too complicated.
Solution: Use io.h directly. Move _CRT_SECURE_NO_DEPRECATE to the build
file. Suppress C4091 warning by setting "_WIN32_WINNT". (Ken
Takata, closes #5626)
Diffstat (limited to 'src/Make_mvc.mak')
| -rw-r--r-- | src/Make_mvc.mak | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 509708167..b95e936f0 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -658,7 +658,8 @@ OPTFLAG = /Ox OPTFLAG = $(OPTFLAG) /GL ! endif # Visual Studio 2005 has 'deprecated' many of the standard CRT functions -CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE +CFLAGS_DEPR = /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE +CFLAGS = $(CFLAGS) $(CFLAGS_DEPR) ! endif # (/Wp64 is deprecated in VC9 and generates an obnoxious warning.) @@ -1348,15 +1349,17 @@ $(VIM): $(VIM).exe $(OUTDIR): if not exist $(OUTDIR)/nul mkdir $(OUTDIR) +CFLAGS_INST = /nologo -DNDEBUG -DWIN32 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) $(CFLAGS_DEPR) + install.exe: dosinst.c dosinst.h version.h - $(CC) /nologo -DNDEBUG -DWIN32 dosinst.c kernel32.lib shell32.lib \ + $(CC) $(CFLAGS_INST) dosinst.c kernel32.lib shell32.lib \ user32.lib ole32.lib advapi32.lib uuid.lib \ -link -subsystem:$(SUBSYSTEM_TOOLS) - if exist install.exe del install.exe ren dosinst.exe install.exe uninstall.exe: uninstall.c dosinst.h version.h - $(CC) /nologo -DNDEBUG -DWIN32 uninstall.c shell32.lib advapi32.lib \ + $(CC) $(CFLAGS_INST) uninstall.c shell32.lib advapi32.lib \ -link -subsystem:$(SUBSYSTEM_TOOLS) vimrun.exe: vimrun.c |