Mercurial > vim

comparison src/Make_bc5.mak @ 16123:a246b020984c v8.1.1066

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1066: VIMDLL isn't actually used commit https://github.com/vim/vim/commit/89828e9fe6de4d70e0e2ccd3c711bd26632c26a9 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Mar 28 22:43:16 2019 +0100 patch 8.1.1066: VIMDLL isn't actually used Problem: VIMDLL isn't actually used. Solution: Remove VIMDLL support.
author Bram Moolenaar <Bram@vim.org>
date Thu, 28 Mar 2019 22:45:04 +0100
parents cdb9cbe731b3
children 570a296aa0b4
comparison
equal deleted inserted replaced
16122:af719c41b341 16123:a246b020984c
70 # CODEGUARD no or yes: set to yes if you want to use CODEGUARD (no) 70 # CODEGUARD no or yes: set to yes if you want to use CODEGUARD (no)
71 # CPUNR 1 through 6: select -CPU argument to compile with (3) 71 # CPUNR 1 through 6: select -CPU argument to compile with (3)
72 # 3 for 386, 4 for 486, 5 for pentium, 6 for pentium pro. 72 # 3 for 386, 4 for 486, 5 for pentium, 6 for pentium pro.
73 # USEDLL no or yes: set to yes to use the Runtime library DLL (no) 73 # USEDLL no or yes: set to yes to use the Runtime library DLL (no)
74 # For USEDLL=yes the cc3250.dll is required to run Vim. 74 # For USEDLL=yes the cc3250.dll is required to run Vim.
75 # VIMDLL no or yes: create vim32.dll, and stub (g)vim.exe (no)
76 # ALIGN 1, 2 or 4: Alignment to use (4 for Win32) 75 # ALIGN 1, 2 or 4: Alignment to use (4 for Win32)
77 # FASTCALL no or yes: set to yes to use register-based function protocol (yes) 76 # FASTCALL no or yes: set to yes to use register-based function protocol (yes)
78 # OPTIMIZE SPACE, SPEED, or MAXSPEED: type of optimization (MAXSPEED) 77 # OPTIMIZE SPACE, SPEED, or MAXSPEED: type of optimization (MAXSPEED)
79 # POSTSCRIPT no or yes: set to yes for PostScript printing 78 # POSTSCRIPT no or yes: set to yes for PostScript printing
80 # FEATURES TINY, SMALL, NORMAL, BIG or HUGE (BIG for WIN32) 79 # FEATURES TINY, SMALL, NORMAL, BIG or HUGE (BIG for WIN32)
185 ### USEDLL: no for statically linked version of run-time, yes for DLL runtime 184 ### USEDLL: no for statically linked version of run-time, yes for DLL runtime
186 !if ("$(USEDLL)"=="") 185 !if ("$(USEDLL)"=="")
187 USEDLL = no 186 USEDLL = no
188 !endif 187 !endif
189 188
190 ### VIMDLL: yes for a DLL version of VIM (NOT RECOMMENDED), no otherwise
191 #VIMDLL = yes
192
193 ### ALIGN: alignment you desire: (1,2 or 4: s/b 4 for Win32) 189 ### ALIGN: alignment you desire: (1,2 or 4: s/b 4 for Win32)
194 !if ("$(ALIGN)"=="") 190 !if ("$(ALIGN)"=="")
195 ALIGN = 4 191 ALIGN = 4
196 !endif 192 !endif
197 193
409 !if ("$(DEBUG)"=="yes") 405 !if ("$(DEBUG)"=="yes")
410 TARGET = gvimd.exe 406 TARGET = gvimd.exe
411 !else 407 !else
412 TARGET = gvim.exe 408 TARGET = gvim.exe
413 !endif 409 !endif
414 !if ("$(VIMDLL)"=="yes")
415 EXETYPE=-WD
416 DEFINES = $(DEFINES) -DVIMDLL
417 !else
418 EXETYPE=-W 410 EXETYPE=-W
419 !endif
420 STARTUPOBJ = c0w32.obj 411 STARTUPOBJ = c0w32.obj
421 LINK2 = -aa 412 LINK2 = -aa
422 RESFILE = vim.res 413 RESFILE = vim.res
423 !else 414 !else
424 !undef NETBEANS 415 !undef NETBEANS
425 !undef CHANNEL 416 !undef CHANNEL
426 !undef XPM 417 !undef XPM
427 !undef VIMDLL
428 !if ("$(DEBUG)"=="yes") 418 !if ("$(DEBUG)"=="yes")
429 TARGET = vimd.exe 419 TARGET = vimd.exe
430 !else 420 !else
431 # for now, anyway: VIMDLL is only for the GUI version 421 # for now, anyway: VIMDLL is only for the GUI version
432 TARGET = vim.exe 422 TARGET = vim.exe
513 .cpp.obj: 503 .cpp.obj:
514 $(CC) $(CCARG) $(CC1) $(CC2)$@ $*.cpp 504 $(CC) $(CCARG) $(CC1) $(CC2)$@ $*.cpp
515 505
516 vimmain = \ 506 vimmain = \
517 $(OBJDIR)\os_w32exe.obj 507 $(OBJDIR)\os_w32exe.obj
518 !if ("$(VIMDLL)"=="yes")
519 vimwinmain = \
520 $(OBJDIR)\os_w32dll.obj
521 !else
522 vimwinmain = \ 508 vimwinmain = \
523 $(OBJDIR)\os_w32exe.obj 509 $(OBJDIR)\os_w32exe.obj
524 !endif
525 510
526 vimobj = \ 511 vimobj = \
527 $(OBJDIR)\arabic.obj \ 512 $(OBJDIR)\arabic.obj \
528 $(OBJDIR)\autocmd.obj \ 513 $(OBJDIR)\autocmd.obj \
529 $(OBJDIR)\blowfish.obj \ 514 $(OBJDIR)\blowfish.obj \
636 !ifdef XPM 621 !ifdef XPM
637 vimobj = $(vimobj) \ 622 vimobj = $(vimobj) \
638 $(OBJDIR)\xpm_w32.obj 623 $(OBJDIR)\xpm_w32.obj
639 !endif 624 !endif
640 625
641 !if ("$(VIMDLL)"=="yes")
642 vimdllobj = $(vimobj)
643 !if ("$(DEBUG)"=="yes")
644 DLLTARGET = vim32d.dll
645 !else
646 DLLTARGET = vim32.dll
647 !endif
648 !else
649 DLLTARGET = joebob
650 !endif
651
652 !if ("$(GUI)"=="yes") 626 !if ("$(GUI)"=="yes")
653 vimobj = $(vimobj) \ 627 vimobj = $(vimobj) \
654 $(vimwinmain) \ 628 $(vimwinmain) \
655 $(OBJDIR)\gui.obj \ 629 $(OBJDIR)\gui.obj \
656 $(OBJDIR)\gui_beval.obj \ 630 $(OBJDIR)\gui_beval.obj \
668 MSG = $(MSG) OLE 642 MSG = $(MSG) OLE
669 !endif 643 !endif
670 !if ("$(USEDLL)"=="yes") 644 !if ("$(USEDLL)"=="yes")
671 MSG = $(MSG) USEDLL 645 MSG = $(MSG) USEDLL
672 !endif 646 !endif
673 !if ("$(VIMDLL)"=="yes")
674 MSG = $(MSG) VIMDLL
675 !endif
676 !if ("$(FASTCALL)"=="yes") 647 !if ("$(FASTCALL)"=="yes")
677 MSG = $(MSG) FASTCALL 648 MSG = $(MSG) FASTCALL
678 !endif 649 !endif
679 !if ("$(IME)"=="yes") 650 !if ("$(IME)"=="yes")
680 MSG = $(MSG) IME 651 MSG = $(MSG) IME
745 MSG = $(MSG) cpu=$(CPUARG) 716 MSG = $(MSG) cpu=$(CPUARG)
746 MSG = $(MSG) Align=$(ALIGNARG) 717 MSG = $(MSG) Align=$(ALIGNARG)
747 718
748 !message $(MSG) 719 !message $(MSG)
749 720
750 !if ("$(VIMDLL)"=="yes")
751 TARGETS = $(DLLTARGET)
752 !endif
753 TARGETS = $(TARGETS) $(TARGET) 721 TARGETS = $(TARGETS) $(TARGET)
754 722
755 # Targets: 723 # Targets:
756 all: vim vimrun.exe install.exe xxd uninstal.exe GvimExt/gvimext.dll 724 all: vim vimrun.exe install.exe xxd uninstal.exe GvimExt/gvimext.dll
757 725
830 cd .. 798 cd ..
831 cd GvimExt 799 cd GvimExt
832 $(MAKE) /f Make_bc5.mak BOR="$(BOR)" clean 800 $(MAKE) /f Make_bc5.mak BOR="$(BOR)" clean
833 cd .. 801 cd ..
834 802
835 $(DLLTARGET): $(OBJDIR) $(vimdllobj) 803
836 $(LINK) @&&|
837 $(LFLAGSDLL) +
838 c0d32.obj +
839 $(vimdllobj)
840 $<,$*
841 !if ("$(CODEGUARD)"=="yes")
842 cg32.lib+
843 !endif
844 # $(OSTYPE)==WIN32 causes os_mswin.c compilation. FEAT_SHORTCUT in it needs OLE
845 ole2w32.lib +
846 import32.lib+
847 !ifdef LUA
848 $(LUA_LIB_FLAG)lua.lib+
849 !endif
850 !ifdef PERL
851 $(PERL_LIB_FLAG)perl.lib+
852 !endif
853 !ifdef PYTHON
854 $(PYTHON_LIB_FLAG)python.lib+
855 !endif
856 !ifdef PYTHON3
857 $(PYTHON3_LIB_FLAG)python3.lib+
858 !endif
859 !ifdef RUBY
860 $(RUBY_LIB_FLAG)ruby.lib+
861 !endif
862 !ifdef TCL
863 $(TCL_LIB_FLAG)tcl.lib+
864 !endif
865 !ifdef XPM
866 xpm.lib+
867 !endif
868 !if ("$(USEDLL)"=="yes")
869 cw32i.lib
870 !else
871 cw32.lib
872 !endif
873 vim.def
874 |
875
876 !if ("$(VIMDLL)"=="yes")
877 $(TARGET): $(OBJDIR) $(DLLTARGET) $(vimmain) $(OBJDIR)\$(RESFILE)
878 !else
879 $(TARGET): $(OBJDIR) $(vimobj) $(OBJDIR)\$(RESFILE) 804 $(TARGET): $(OBJDIR) $(vimobj) $(OBJDIR)\$(RESFILE)
880 !endif
881 $(LINK) @&&| 805 $(LINK) @&&|
882 $(LFLAGS) + 806 $(LFLAGS) +
883 $(STARTUPOBJ) + 807 $(STARTUPOBJ) +
884 !if ("$(VIMDLL)"=="yes")
885 $(vimmain)
886 !else
887 $(vimobj) 808 $(vimobj)
888 !endif
889 $<,$* 809 $<,$*
890 !if ("$(CODEGUARD)"=="yes") 810 !if ("$(CODEGUARD)"=="yes")
891 cg32.lib+ 811 cg32.lib+
892 !endif 812 !endif
893 # $(OSTYPE)==WIN32 causes os_mswin.c compilation. FEAT_SHORTCUT in it needs OLE 813 # $(OSTYPE)==WIN32 causes os_mswin.c compilation. FEAT_SHORTCUT in it needs OLE