diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-07-19 11:28:17 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-07-19 11:28:17 +0200 |
| commit | 4fc63505d393451ad3780dc0390cb48587597aaf (patch) | |
| tree | df1f9cfc5fb7f912ea223b7580b4a213da2401ff | |
| parent | 8c0095c59a34ef74fb873036cfbf1aa90be449f3 (diff) | |
| download | vim-git-8.0.0731.tar.gz | |
patch 8.0.0731: cannot build the terminal feature on MS-Windowsv8.0.0731
Problem: Cannot build the terminal feature on MS-Windows.
Solution: Add the Makefile changes. (Yasuhiro Matsumoto, closes #1851)
| -rw-r--r-- | src/Make_cyg_ming.mak | 9 | ||||
| -rw-r--r-- | src/Make_mvc.mak | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 22 insertions, 3 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index b2927200a..95619c465 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -73,6 +73,7 @@ CHANNEL=yes else CHANNEL=$(GUI) endif +TERMINAL=no # Link against the shared version of libstdc++ by default. Set @@ -557,6 +558,10 @@ ifeq ($(CHANNEL),yes) DEFINES += -DFEAT_JOB_CHANNEL endif +ifeq ($(TERMINAL),yes) +DEFINES += -DFEAT_TERMINAL +endif + # DirectWrite (DirectX) ifeq ($(DIRECTX),yes) # Only allow DirectWrite for a GUI build. @@ -743,6 +748,10 @@ LIB += -L$(XPM)/lib -lXpm endif endif +ifeq ($(TERMINAL),yes) +OBJ += $(OUTDIR)/terminal.o +endif + ifdef MZSCHEME MZSCHEME_SUFFIX = Z diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 293bbf050..6ad368b39 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -351,6 +351,12 @@ CSCOPE_OBJ = $(OBJDIR)/if_cscope.obj CSCOPE_DEFS = -DFEAT_CSCOPE !endif +!if "$(TERMINAL)" == "yes" +TERMINAL_OBJ = $(OBJDIR)/terminal.obj +TERMINAL_DEFS = -DFEAT_TERMINAL +TERMINAL_SRC = terminal.c +!endif + !ifndef NETBEANS NETBEANS = $(GUI) !endif @@ -458,7 +464,7 @@ WINVER = 0x0501 #VIMRUNTIMEDIR = somewhere CFLAGS = -c /W3 /nologo $(CVARS) -I. -Iproto -DHAVE_PATHDEF -DWIN32 \ - $(CSCOPE_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \ + $(CSCOPE_DEFS) $(TERMINAL_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \ $(NBDEBUG_DEFS) $(XPM_DEFS) \ $(DEFINES) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \ /Fo$(OUTDIR)/ @@ -1145,12 +1151,12 @@ all: $(VIM).exe \ $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ - $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ + $(CSCOPE_OBJ) $(TERMINAL_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \ version.c version.h $(CC) $(CFLAGS) version.c $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(CUI_OBJ) $(OLE_OBJ) \ $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \ - $(TCL_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \ + $(TCL_OBJ) $(CSCOPE_OBJ) $(TERMINAL_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \ $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1 @@ -1384,6 +1390,8 @@ $(OUTDIR)/ops.obj: $(OUTDIR) ops.c $(INCL) $(OUTDIR)/os_mswin.obj: $(OUTDIR) os_mswin.c $(INCL) +$(OUTDIR)/terminal.obj: $(OUTDIR) terminal.c $(INCL) + $(OUTDIR)/winclip.obj: $(OUTDIR) winclip.c $(INCL) $(OUTDIR)/os_win32.obj: $(OUTDIR) os_win32.c $(INCL) os_win32.h diff --git a/src/version.c b/src/version.c index 97ef94e06..9c94fe8f8 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 731, +/**/ 730, /**/ 729, |