Mercurial > vim

comparison src/Make_bc5.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 05b88224cea1
comparison
equal deleted inserted replaced
7742:5f6f35a3cb12 7743:6069f43cea4e
84 # POSTSCRIPT no or yes: set to yes for PostScript printing 84 # POSTSCRIPT no or yes: set to yes for PostScript printing
85 # FEATURES TINY, SMALL, NORMAL, BIG or HUGE 85 # FEATURES TINY, SMALL, NORMAL, BIG or HUGE
86 # (BIG for WIN32, SMALL for DOS16) 86 # (BIG for WIN32, SMALL for DOS16)
87 # WINVER 0x0400 or 0x0500: minimum Win32 version to support (0x0400) 87 # WINVER 0x0400 or 0x0500: minimum Win32 version to support (0x0400)
88 # CSCOPE no or yes: include support for Cscope interface (yes) 88 # CSCOPE no or yes: include support for Cscope interface (yes)
89 # NETBEANS no or yes: include support for Netbeans interface (yes if GUI 89 # NETBEANS no or yes: include support for Netbeans interface; also
90 # requires CHANNEL (yes if GUI
90 # is yes) 91 # is yes)
91 # NBDEBUG no or yes: include support for debugging Netbeans interface (no) 92 # NBDEBUG no or yes: include support for debugging Netbeans interface (no)
93 # CHANNEL no or yes: include support for inter process communication (yes
94 # if GUI is yes)
92 # XPM define to path to XPM dir to get support for loading XPM images. 95 # XPM define to path to XPM dir to get support for loading XPM images.
93 96
94 ### BOR: root of the BC installation 97 ### BOR: root of the BC installation
95 !if ("$(BOR)"=="") 98 !if ("$(BOR)"=="")
96 BOR = c:\bc5 99 BOR = c:\bc5
133 !endif 136 !endif
134 137
135 ### NETBEANS: yes to enable NetBeans interface support, no to disable it 138 ### NETBEANS: yes to enable NetBeans interface support, no to disable it
136 !if ("$(NETBEANS)"=="") && ("$(GUI)"=="yes") 139 !if ("$(NETBEANS)"=="") && ("$(GUI)"=="yes")
137 NETBEANS = yes 140 NETBEANS = yes
141 !endif
142
143 ### CHANNEL: yes to enable inter process communication, no to disable it
144 !if ("$(CHANNEL)"=="") && ("$(GUI)"=="yes")
145 CHANNEL = yes
138 !endif 146 !endif
139 147
140 ### LUA: uncomment this line if you want lua support in vim 148 ### LUA: uncomment this line if you want lua support in vim
141 # LUA=c:\lua 149 # LUA=c:\lua
142 150
464 STARTUPOBJ = c0w32.obj 472 STARTUPOBJ = c0w32.obj
465 LINK2 = -aa 473 LINK2 = -aa
466 RESFILE = vim.res 474 RESFILE = vim.res
467 !else 475 !else
468 !undef NETBEANS 476 !undef NETBEANS
477 !undef CHANNEL
469 !undef XPM 478 !undef XPM
470 !undef VIMDLL 479 !undef VIMDLL
471 !if ("$(DEBUG)"=="yes") 480 !if ("$(DEBUG)"=="yes")
472 TARGET = vimd.exe 481 TARGET = vimd.exe
473 !else 482 !else
486 !endif 495 !endif
487 RESFILE = vim.res 496 RESFILE = vim.res
488 !endif 497 !endif
489 498
490 !if ("$(NETBEANS)"=="yes") 499 !if ("$(NETBEANS)"=="yes")
500 !if ("$(CHANNEL)"!="yes")
501 # cannot use Netbeans without CHANNEL
502 NETBEANS = no
503 !else
491 DEFINES = $(DEFINES) -DFEAT_NETBEANS_INTG 504 DEFINES = $(DEFINES) -DFEAT_NETBEANS_INTG
492 !if ("$(NBDEBUG)"=="yes") 505 !if ("$(NBDEBUG)"=="yes")
493 DEFINES = $(DEFINES) -DNBDEBUG 506 DEFINES = $(DEFINES) -DNBDEBUG
494 NBDEBUG_DEP = nbdebug.h nbdebug.c 507 NBDEBUG_DEP = nbdebug.h nbdebug.c
495 !endif 508 !endif
509 !endif
510 !endif
511
512 !if ("$(CHANNEL)"=="yes")
513 DEFINES = $(DEFINES) -DFEAT_CHANNEL
496 !endif 514 !endif
497 515
498 !ifdef XPM 516 !ifdef XPM
499 !if ("$(GUI)"=="yes") 517 !if ("$(GUI)"=="yes")
500 DEFINES = $(DEFINES) -DFEAT_XPM_W32 518 DEFINES = $(DEFINES) -DFEAT_XPM_W32
671 !if ("$(NETBEANS)"=="yes") 689 !if ("$(NETBEANS)"=="yes")
672 vimobj = $(vimobj) \ 690 vimobj = $(vimobj) \
673 $(OBJDIR)\netbeans.obj 691 $(OBJDIR)\netbeans.obj
674 !endif 692 !endif
675 693
694 !if ("$(CHANNEL)"=="yes")
695 vimobj = $(vimobj) \
696 $(OBJDIR)\channel.obj
697 !endif
698
676 !ifdef XPM 699 !ifdef XPM
677 vimobj = $(vimobj) \ 700 vimobj = $(vimobj) \
678 $(OBJDIR)\xpm_w32.obj 701 $(OBJDIR)\xpm_w32.obj
679 !endif 702 !endif
680 703
745 !if ("$(CSCOPE)"=="yes") 768 !if ("$(CSCOPE)"=="yes")
746 MSG = $(MSG) CSCOPE 769 MSG = $(MSG) CSCOPE
747 !endif 770 !endif
748 !if ("$(NETBEANS)"=="yes") 771 !if ("$(NETBEANS)"=="yes")
749 MSG = $(MSG) NETBEANS 772 MSG = $(MSG) NETBEANS
773 !endif
774 !if ("$(CHANNEL)"=="yes")
775 MSG = $(MSG) CHANNEL
750 !endif 776 !endif
751 !ifdef XPM 777 !ifdef XPM
752 MSG = $(MSG) XPM 778 MSG = $(MSG) XPM
753 !endif 779 !endif
754 !ifdef LUA 780 !ifdef LUA
1026 $(OBJDIR)\xpm_w32.obj: xpm_w32.c xpm.lib 1052 $(OBJDIR)\xpm_w32.obj: xpm_w32.c xpm.lib
1027 $(CC) $(CCARG) $(CC1) $(CC2)$@ -pc xpm_w32.c 1053 $(CC) $(CCARG) $(CC1) $(CC2)$@ -pc xpm_w32.c
1028 1054
1029 $(OBJDIR)\netbeans.obj: netbeans.c $(NBDEBUG_DEP) 1055 $(OBJDIR)\netbeans.obj: netbeans.c $(NBDEBUG_DEP)
1030 $(CC) $(CCARG) $(CC1) $(CC2)$@ netbeans.c 1056 $(CC) $(CCARG) $(CC1) $(CC2)$@ netbeans.c
1057
1058 $(OBJDIR)\channel.obj: channel.c
1059 $(CC) $(CCARG) $(CC1) $(CC2)$@ channel.c
1031 1060
1032 $(OBJDIR)\vim.res: vim.rc version.h tools.bmp tearoff.bmp \ 1061 $(OBJDIR)\vim.res: vim.rc version.h tools.bmp tearoff.bmp \
1033 vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico 1062 vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico
1034 $(BRC) -fo$(OBJDIR)\vim.res -i $(BOR)\include -w32 -r vim.rc @&&| 1063 $(BRC) -fo$(OBJDIR)\vim.res -i $(BOR)\include -w32 -r vim.rc @&&|
1035 $(DEFINES) 1064 $(DEFINES)