Mercurial > vim
comparison src/Make_mvc.mak @ 12600:590424e87b65 v8.0.1178
patch 8.0.1178: using old compiler on MS-Windows
commit https://github.com/vim/vim/commit/73f4439ca690d8224df8f88dc71a43fafdcc89bf
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Oct 7 18:38:43 2017 +0200
patch 8.0.1178: using old compiler on MS-Windows
Problem: Using old compiler on MS-Windows.
Solution: Switch default build on MS-Windows to use MSVC 2015. (Ken Takata)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 07 Oct 2017 18:45:04 +0200 |
parents | 626fb8e8bb8a |
children | c3bb4552d15d |
comparison
equal
deleted
inserted
replaced
12599:e85e7c96d517 | 12600:590424e87b65 |
---|---|
585 CPUARG = /arch:AVX2 | 585 CPUARG = /arch:AVX2 |
586 ! endif | 586 ! endif |
587 ! endif | 587 ! endif |
588 !endif | 588 !endif |
589 | 589 |
590 # Pass CPUARG to GVimExt, to avoid using version-dependent defaults | 590 # Pass CPUARG to GvimExt, to avoid using version-dependent defaults |
591 MAKEFLAGS_GVIMEXT = $(MAKEFLAGS_GVIMEXT) CPUARG="$(CPUARG)" | 591 MAKEFLAGS_GVIMEXT = $(MAKEFLAGS_GVIMEXT) CPUARG="$(CPUARG)" |
592 | 592 |
593 | 593 |
594 LIBC = | 594 LIBC = |
595 DEBUGINFO = /Zi | 595 DEBUGINFO = /Zi |
787 !else | 787 !else |
788 SUBSYSTEM = console | 788 SUBSYSTEM = console |
789 CUI_INCL = iscygpty.h | 789 CUI_INCL = iscygpty.h |
790 CUI_OBJ = $(OUTDIR)\iscygpty.obj | 790 CUI_OBJ = $(OUTDIR)\iscygpty.obj |
791 !endif | 791 !endif |
792 SUBSYSTEM_TOOLS = console | |
792 | 793 |
793 !if "$(SUBSYSTEM_VER)" != "" | 794 !if "$(SUBSYSTEM_VER)" != "" |
794 SUBSYSTEM = $(SUBSYSTEM),$(SUBSYSTEM_VER) | 795 SUBSYSTEM = $(SUBSYSTEM),$(SUBSYSTEM_VER) |
796 SUBSYSTEM_TOOLS = $(SUBSYSTEM_TOOLS),$(SUBSYSTEM_VER) | |
797 # Pass SUBSYSTEM_VER to GvimExt and other tools | |
798 MAKEFLAGS_GVIMEXT = $(MAKEFLAGS_GVIMEXT) SUBSYSTEM_VER=$(SUBSYSTEM_VER) | |
799 MAKEFLAGS_TOOLS = $(MAKEFLAGS_TOOLS) SUBSYSTEM_VER=$(SUBSYSTEM_VER) | |
795 !endif | 800 !endif |
796 | 801 |
797 !if "$(GUI)" == "yes" && "$(DIRECTX)" == "yes" | 802 !if "$(GUI)" == "yes" && "$(DIRECTX)" == "yes" |
798 CFLAGS = $(CFLAGS) $(DIRECTX_DEFS) | 803 CFLAGS = $(CFLAGS) $(DIRECTX_DEFS) |
799 GUI_INCL = $(GUI_INCL) $(DIRECTX_INCL) | 804 GUI_INCL = $(GUI_INCL) $(DIRECTX_INCL) |
1184 $(OUTDIR): | 1189 $(OUTDIR): |
1185 if not exist $(OUTDIR)/nul mkdir $(OUTDIR) | 1190 if not exist $(OUTDIR)/nul mkdir $(OUTDIR) |
1186 | 1191 |
1187 install.exe: dosinst.c | 1192 install.exe: dosinst.c |
1188 $(CC) /nologo -DNDEBUG -DWIN32 dosinst.c kernel32.lib shell32.lib \ | 1193 $(CC) /nologo -DNDEBUG -DWIN32 dosinst.c kernel32.lib shell32.lib \ |
1189 user32.lib ole32.lib advapi32.lib uuid.lib | 1194 user32.lib ole32.lib advapi32.lib uuid.lib \ |
1195 -link -subsystem:$(SUBSYSTEM_TOOLS) | |
1190 - if exist install.exe del install.exe | 1196 - if exist install.exe del install.exe |
1191 ren dosinst.exe install.exe | 1197 ren dosinst.exe install.exe |
1192 | 1198 |
1193 uninstal.exe: uninstal.c | 1199 uninstal.exe: uninstal.c |
1194 $(CC) /nologo -DNDEBUG -DWIN32 uninstal.c shell32.lib advapi32.lib | 1200 $(CC) /nologo -DNDEBUG -DWIN32 uninstal.c shell32.lib advapi32.lib \ |
1201 -link -subsystem:$(SUBSYSTEM_TOOLS) | |
1195 | 1202 |
1196 vimrun.exe: vimrun.c | 1203 vimrun.exe: vimrun.c |
1197 $(CC) /nologo -DNDEBUG vimrun.c | 1204 $(CC) /nologo -DNDEBUG vimrun.c -link -subsystem:$(SUBSYSTEM_TOOLS) |
1198 | 1205 |
1199 xxd/xxd.exe: xxd/xxd.c | 1206 xxd/xxd.exe: xxd/xxd.c |
1200 cd xxd | 1207 cd xxd |
1201 $(MAKE) /NOLOGO -f Make_mvc.mak | 1208 $(MAKE) /NOLOGO -f Make_mvc.mak $(MAKEFLAGS_TOOLS) |
1202 cd .. | 1209 cd .. |
1203 | 1210 |
1204 tee/tee.exe: tee/tee.c | 1211 tee/tee.exe: tee/tee.c |
1205 cd tee | 1212 cd tee |
1206 $(MAKE) /NOLOGO -f Make_mvc.mak | 1213 $(MAKE) /NOLOGO -f Make_mvc.mak $(MAKEFLAGS_TOOLS) |
1207 cd .. | 1214 cd .. |
1208 | 1215 |
1209 GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h | 1216 GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h |
1210 cd GvimExt | 1217 cd GvimExt |
1211 $(MAKE) /NOLOGO -f Makefile $(MAKEFLAGS_GVIMEXT) | 1218 $(MAKE) /NOLOGO -f Makefile $(MAKEFLAGS_GVIMEXT) |