Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Prepare for adding an MS-Windows implementaiton. #1851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Prepare for adding an MS-Windows implementaiton. #1851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0912efd
Prepare for adding an MS-Windows implementaiton.
mattn Jul 19, 2017
a898b78
Prepare FEAT_TERMINAL for MSVC
mattn Jul 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/Make_cyg_ming.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ CHANNEL=yes
else
CHANNEL=$(GUI)
endif
TERMINAL=no


# Link against the shared version of libstdc++ by default. Set
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -743,6 +748,10 @@ LIB += -L$(XPM)/lib -lXpm
endif
endif

ifeq ($(TERMINAL),yes)
OBJ += $(OUTDIR)/terminal.o
endif


ifdef MZSCHEME
MZSCHEME_SUFFIX = Z
Expand Down
14 changes: 11 additions & 3 deletions src/Make_mvc.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)/
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down