Mercurial > vim

comparison src/Make_mvc.mak @ 7743:6069f43cea4e v7.4.1169

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/e0874f8cbcddfcf9965a85ba35199964efb1d01a Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 24 20:36:41 2016 +0100 patch 7.4.1169 Problem: The socket I/O is intertwined with the netbeans code. Solution: Start refactoring the netbeans communication to split off the socket I/O. Add the +channel feature.
author Christian Brabandt <cb@256bit.org>
date Sun, 24 Jan 2016 20:45:05 +0100
parents bce3b5ddb393
children a98b93736894
comparison
equal deleted inserted replaced
7742:5f6f35a3cb12 7743:6069f43cea4e
94 # See http://sourceforge.net/projects/gettext/ 94 # See http://sourceforge.net/projects/gettext/
95 # 95 #
96 # PostScript printing: POSTSCRIPT=yes (default is no) 96 # PostScript printing: POSTSCRIPT=yes (default is no)
97 # 97 #
98 # Netbeans Support: NETBEANS=[yes or no] (default is yes if GUI is yes) 98 # Netbeans Support: NETBEANS=[yes or no] (default is yes if GUI is yes)
99 # Requires CHANNEL.
100 #
101 # Netbeans Debugging Support: NBDEBUG=[yes or no] (should be no, yes
102 # doesn't work)
103 #
104 # Inter process communication: CHANNEL=[yes or no] (default is yes if GUI
105 # is yes)
99 # 106 #
100 # XPM Image Support: XPM=[path to XPM directory] 107 # XPM Image Support: XPM=[path to XPM directory]
101 # Default is "xpm", using the files included in the distribution. 108 # Default is "xpm", using the files included in the distribution.
102 # Use "no" to disable this feature. 109 # Use "no" to disable this feature.
103 # 110 #
111 # Debug version: DEBUG=yes 118 # Debug version: DEBUG=yes
112 # Mapfile: MAP=[no, yes or lines] (default is yes) 119 # Mapfile: MAP=[no, yes or lines] (default is yes)
113 # no: Don't write a mapfile. 120 # no: Don't write a mapfile.
114 # yes: Write a normal mapfile. 121 # yes: Write a normal mapfile.
115 # lines: Write a mapfile with line numbers (only for VC6 and later) 122 # lines: Write a mapfile with line numbers (only for VC6 and later)
116 #
117 # Netbeans Debugging Support: NBDEBUG=[yes or no] (should be no, yes
118 # doesn't work)
119 # 123 #
120 # Static Code Analysis: ANALYZE=yes (works with VS2012 only) 124 # Static Code Analysis: ANALYZE=yes (works with VS2012 only)
121 # 125 #
122 # You can combine any of these interfaces 126 # You can combine any of these interfaces
123 # 127 #
288 292
289 !ifndef NETBEANS 293 !ifndef NETBEANS
290 NETBEANS = $(GUI) 294 NETBEANS = $(GUI)
291 !endif 295 !endif
292 296
293 # Only allow NETBEANS and XPM for a GUI build. 297 !ifndef CHANNEL
298 CHANNEL = $(GUI)
299 !endif
300
301 # Only allow NETBEANS and XPM for a GUI build and CHANNEL.
294 !if "$(GUI)" == "yes" 302 !if "$(GUI)" == "yes"
295 !if "$(NETBEANS)" == "yes" 303 !if "$(NETBEANS)" == "yes" && "$(CHANNEL)" == "yes"
296 # NETBEANS - Include support for Netbeans integration 304 # NETBEANS - Include support for Netbeans integration
297 NETBEANS_PRO = proto/netbeans.pro 305 NETBEANS_PRO = proto/netbeans.pro
298 NETBEANS_OBJ = $(OBJDIR)/netbeans.obj 306 NETBEANS_OBJ = $(OBJDIR)/netbeans.obj
299 NETBEANS_DEFS = -DFEAT_NETBEANS_INTG 307 NETBEANS_DEFS = -DFEAT_NETBEANS_INTG
300 308
329 XPM_OBJ = $(OBJDIR)/xpm_w32.obj 337 XPM_OBJ = $(OBJDIR)/xpm_w32.obj
330 XPM_DEFS = -DFEAT_XPM_W32 338 XPM_DEFS = -DFEAT_XPM_W32
331 XPM_LIB = $(XPM)\lib\libXpm.lib 339 XPM_LIB = $(XPM)\lib\libXpm.lib
332 XPM_INC = -I $(XPM)\include -I $(XPM)\..\include 340 XPM_INC = -I $(XPM)\include -I $(XPM)\..\include
333 !endif 341 !endif
342 !endif
343
344 !if "$(CHANNEL)" == "yes"
345 CHANNEL_PRO = proto/channel.pro
346 CHANNEL_OBJ = $(OBJDIR)/channel.obj
347 CHANNEL_DEFS = -DFEAT_CHANNEL
348
349 NETBEANS_LIB = WSock32.lib
334 !endif 350 !endif
335 351
336 # Set which version of the CRT to use 352 # Set which version of the CRT to use
337 !if defined(USE_MSVCRT) 353 !if defined(USE_MSVCRT)
338 # CVARS = $(cvarsdll) 354 # CVARS = $(cvarsdll)
363 # default, use these lines. 379 # default, use these lines.
364 #VIMRCLOC = somewhere 380 #VIMRCLOC = somewhere
365 #VIMRUNTIMEDIR = somewhere 381 #VIMRUNTIMEDIR = somewhere
366 382
367 CFLAGS = -c /W3 /nologo $(CVARS) -I. -Iproto -DHAVE_PATHDEF -DWIN32 \ 383 CFLAGS = -c /W3 /nologo $(CVARS) -I. -Iproto -DHAVE_PATHDEF -DWIN32 \
368 $(SNIFF_DEFS) $(CSCOPE_DEFS) $(NETBEANS_DEFS) \ 384 $(SNIFF_DEFS) $(CSCOPE_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \
369 $(NBDEBUG_DEFS) $(XPM_DEFS) \ 385 $(NBDEBUG_DEFS) $(XPM_DEFS) \
370 $(DEFINES) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \ 386 $(DEFINES) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) \
371 /Fo$(OUTDIR)/ 387 /Fo$(OUTDIR)/
372 388
373 #>>>>> end of choices 389 #>>>>> end of choices
1003 tee/tee.exe \ 1019 tee/tee.exe \
1004 GvimExt/gvimext.dll 1020 GvimExt/gvimext.dll
1005 1021
1006 $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \ 1022 $(VIM).exe: $(OUTDIR) $(OBJ) $(GUI_OBJ) $(OLE_OBJ) $(OLE_IDL) $(MZSCHEME_OBJ) \
1007 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \ 1023 $(LUA_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) $(TCL_OBJ) \
1008 $(SNIFF_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(XPM_OBJ) \ 1024 $(SNIFF_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) $(XPM_OBJ) \
1009 version.c version.h 1025 version.c version.h
1010 $(CC) $(CFLAGS) version.c 1026 $(CC) $(CFLAGS) version.c
1011 $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(OLE_OBJ) \ 1027 $(link) $(LINKARGS1) -out:$(VIM).exe $(OBJ) $(GUI_OBJ) $(OLE_OBJ) \
1012 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \ 1028 $(LUA_OBJ) $(MZSCHEME_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(PYTHON3_OBJ) $(RUBY_OBJ) \
1013 $(TCL_OBJ) $(SNIFF_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) \ 1029 $(TCL_OBJ) $(SNIFF_OBJ) $(CSCOPE_OBJ) $(NETBEANS_OBJ) $(CHANNEL_OBJ) \
1014 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2) 1030 $(XPM_OBJ) $(OUTDIR)\version.obj $(LINKARGS2)
1015 if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1 1031 if exist $(VIM).exe.manifest mt.exe -nologo -manifest $(VIM).exe.manifest -updateresource:$(VIM).exe;1
1016 1032
1017 $(VIM): $(VIM).exe 1033 $(VIM): $(VIM).exe
1018 1034
1224 $(OUTDIR)/move.obj: $(OUTDIR) move.c $(INCL) 1240 $(OUTDIR)/move.obj: $(OUTDIR) move.c $(INCL)
1225 1241
1226 $(OUTDIR)/mbyte.obj: $(OUTDIR) mbyte.c $(INCL) 1242 $(OUTDIR)/mbyte.obj: $(OUTDIR) mbyte.c $(INCL)
1227 1243
1228 $(OUTDIR)/netbeans.obj: $(OUTDIR) netbeans.c $(NBDEBUG_SRC) $(INCL) 1244 $(OUTDIR)/netbeans.obj: $(OUTDIR) netbeans.c $(NBDEBUG_SRC) $(INCL)
1245
1246 $(OUTDIR)/channel.obj: $(OUTDIR) channel.c $(INCL)
1229 1247
1230 $(OUTDIR)/normal.obj: $(OUTDIR) normal.c $(INCL) 1248 $(OUTDIR)/normal.obj: $(OUTDIR) normal.c $(INCL)
1231 1249
1232 $(OUTDIR)/option.obj: $(OUTDIR) option.c $(INCL) 1250 $(OUTDIR)/option.obj: $(OUTDIR) option.c $(INCL)
1233 1251
1360 proto/tag.pro \ 1378 proto/tag.pro \
1361 proto/term.pro \ 1379 proto/term.pro \
1362 proto/ui.pro \ 1380 proto/ui.pro \
1363 proto/undo.pro \ 1381 proto/undo.pro \
1364 proto/window.pro \ 1382 proto/window.pro \
1365 $(NETBEANS_PRO) 1383 $(NETBEANS_PRO) \
1384 $(CHANNEL_PRO)
1366 1385
1367 .SUFFIXES: .cod .i 1386 .SUFFIXES: .cod .i
1368 1387
1369 # Generate foo.cod (mixed source and assembly listing) from foo.c via "nmake 1388 # Generate foo.cod (mixed source and assembly listing) from foo.c via "nmake
1370 # foo.cod" 1389 # foo.cod"