diff options
42 files changed, 80 insertions, 1476 deletions
diff --git a/.gitignore b/.gitignore index 5767bae79c..188636c175 100644 --- a/.gitignore +++ b/.gitignore @@ -43,14 +43,6 @@ gvim.lib runtime/doc/uganda.nsis.txt nsis/icons/* -# Borland C++ -bcc.cfg -*.ilc -*.ild -*.ilf -*.ils -*.tds - # NetBeans nbproject/* @@ -45,14 +45,6 @@ gvim.lib runtime/doc/uganda.nsis.txt nsis/icons/* -# Borland C++ -bcc.cfg -*.ilc -*.ild -*.ilf -*.ils -*.tds - # NetBeans nbproject/* @@ -421,7 +421,6 @@ SRC_DOS = \ src/GvimExt/uninst.bat \ README_srcdos.txt \ src/INSTALLpc.txt \ - src/Make_bc5.mak \ src/Make_cyg.mak \ src/Make_cyg_ming.mak \ src/Make_ming.mak \ @@ -474,7 +473,6 @@ SRC_DOS = \ src/xpm_w32.c \ src/xpm_w32.h \ src/tee/Make_mvc.mak \ - src/xxd/Make_bc5.mak \ src/xxd/Make_ming.mak \ src/xxd/Make_mvc.mak \ nsis/gvim.nsi \ diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt index 37a5772f42..4564565516 100644 --- a/runtime/doc/debug.txt +++ b/runtime/doc/debug.txt @@ -80,9 +80,8 @@ then the PDB was built with the EXE. If you have Visual Studio, use that instead of the VC Toolkit and WinDbg. -For other compilers, you should always use the corresponding debugger: TD for -a Vim executable compiled with the Borland compiler; gdb (see above -|debug-gcc|) for the Cygwin and MinGW compilers. +For other compilers, you should always use the corresponding debugger: gdb +(see above |debug-gcc|) for the Cygwin and MinGW compilers. *debug-vs2005* diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt index 2d0cc2278d..9c7867c65f 100644 --- a/runtime/doc/develop.txt +++ b/runtime/doc/develop.txt @@ -278,7 +278,6 @@ wait don't use as argument to a function, conflicts with types.h index shadows global declaration time shadows global declaration new C++ reserved keyword -try Borland C++ doesn't like it to be used as a variable. clear Mac curses.h echo Mac curses.h diff --git a/runtime/doc/usr_90.txt b/runtime/doc/usr_90.txt index a5b429280c..087de8f2da 100644 --- a/runtime/doc/usr_90.txt +++ b/runtime/doc/usr_90.txt @@ -281,9 +281,8 @@ unpacked them. In case you are not satisfied with the features included in the supplied binaries, you could try compiling Vim yourself. Get the source archive from the same location as where the binaries are. You need a compiler for which a -makefile exists. Microsoft Visual C works, but is expensive. The Free -Borland command-line compiler 5.5 can be used, as well as the free MingW and -Cygwin compilers. Check the file src/INSTALLpc.txt for hints. +makefile exists. Microsoft Visual C works, but is expensive. The free MinGW +and Cygwin compilers can be used. Check the file src/INSTALLpc.txt for hints. ============================================================================== *90.3* Upgrading diff --git a/src/GvimExt/Make_bc5.mak b/src/GvimExt/Make_bc5.mak deleted file mode 100644 index 363c6d608f..0000000000 --- a/src/GvimExt/Make_bc5.mak +++ /dev/null @@ -1,43 +0,0 @@ -### USEDLL no for statically linked version of run-time, yes for DLL runtime -### BOR path to root of Borland C install (c:\bc5) - -### (requires cc3250.dll be available in %PATH%) -!if ("$(USEDLL)"=="") -USEDLL = no -!endif - -### BOR: root of the BC installation -!if ("$(BOR)"=="") -BOR = c:\bc5 -!endif - -CC = $(BOR)\bin\Bcc32 -BRC = $(BOR)\bin\brc32 -LINK = $(BOR)\BIN\ILink32 -INCLUDE = $(BOR)\include;. -LIB = $(BOR)\lib - -!if ("$(USEDLL)"=="yes") -RT_DEF = -D_RTLDLL -RT_LIB = cw32i.lib -!else -RT_DEF = -RT_LIB = cw32.lib -!endif - - -all : gvimext.dll - -gvimext.obj : gvimext.cpp gvimext.h - $(CC) -tWD -I$(INCLUDE) -c -DFEAT_GETTEXT $(RT_DEF) -w- gvimext.cpp - -gvimext.res : gvimext.rc - $(BRC) -r gvimext.rc - -gvimext.dll : gvimext.obj gvimext.res - $(LINK) -L$(LIB) -aa gvimext.obj, gvimext.dll, , c0d32.obj $(RT_LIB) import32.lib, gvimext.def, gvimext.res - -clean : - -@del gvimext.obj - -@del gvimext.res - -@del gvimext.dll diff --git a/src/GvimExt/gvimext.cpp b/src/GvimExt/gvimext.cpp index b9d9d91f01..53d96df8bf 100644 --- a/src/GvimExt/gvimext.cpp +++ b/src/GvimExt/gvimext.cpp @@ -16,14 +16,7 @@ #include "gvimext.h" -#ifdef __BORLANDC__ -# include <dir.h> -# ifndef _strnicmp -# define _strnicmp(a, b, c) strnicmp((a), (b), (c)) -# endif -#else static char *searchpath(char *name); -#endif // Always get an error while putting the following stuff to the // gvimext.h file as class protected variables, give up and @@ -917,7 +910,6 @@ BOOL CShellExt::LoadMenuIcon() return TRUE; } -#ifndef __BORLANDC__ static char * searchpath(char *name) { @@ -937,7 +929,6 @@ searchpath(char *name) } return (char *)""; } -#endif STDMETHODIMP CShellExt::InvokeGvim(HWND hParent, LPCSTR /* pszWorkingDir */, diff --git a/src/GvimExt/gvimext.rc b/src/GvimExt/gvimext.rc index 22102db75f..10476da4fa 100644 --- a/src/GvimExt/gvimext.rc +++ b/src/GvimExt/gvimext.rc @@ -7,9 +7,7 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#ifndef __BORLANDC__ -# include "winresrc.h" -#endif +#include "winresrc.h" ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt index 0c276fa830..c72875a8be 100644 --- a/src/INSTALLpc.txt +++ b/src/INSTALLpc.txt @@ -25,21 +25,20 @@ Contents: 2. Using MSYS2 with MinGW 3. Using MinGW 4. Cygwin -5. Borland -6. Cross compiling for Win32 from a Linux machine -7. Building with Python support -8. Building with Python3 support -9. Building with Racket or MzScheme support -10. Building with Lua support -11. Building with Perl support -12. Building with Ruby support -13. Building with Tcl support -14. Building with Terminal support -15. Building with DirectX (DirectWrite) support -16. Windows 3.1 -17. MS-DOS - -18. Installing after building from sources +5. Cross compiling for Win32 from a Linux machine +6. Building with Python support +7. Building with Python3 support +8. Building with Racket or MzScheme support +9. Building with Lua support +10. Building with Perl support +11. Building with Ruby support +12. Building with Tcl support +13. Building with Terminal support +14. Building with DirectX (DirectWrite) support +15. Windows 3.1 +16. MS-DOS + +17. Installing after building from sources The currently recommended way (that means it has been verified to work) is @@ -451,14 +450,7 @@ running on Unix), while with Make_cyg.mak you get a Windows application (like with the other makefiles). -5. Borland -=========== - -Use Make_bc5.mak with Borland C++ 5.x. See - http://users.skynet.be/antoine.mechelynck/vim/compile.htm - - -6. Cross compiling for Win32 from a Linux machine +5. Cross compiling for Win32 from a Linux machine ================================================= [Update of 1) needs to be verified] @@ -478,7 +470,7 @@ your Linux (or other unix) box. To do this, you need to follow a few steps: Now you have created the Windows binary from your Linux box! Have fun... -7. Building with Python support +6. Building with Python support =============================== For building with MSVC 2008 the "Windows Installer" from www.python.org @@ -539,7 +531,7 @@ Now just do: You will end up with a Python-enabled, Win32 version. Enjoy! -8. Building with Python3 support +7. Building with Python3 support ================================ For building with MSVC 2008 the "Windows Installer" from www.python.org @@ -576,7 +568,7 @@ When using msys2 and link with Python3 bundled with msys2 (as one line): libstdc++-6.dll.) -9. Building with Racket or MzScheme support +8. Building with Racket or MzScheme support ======================================== 1) Building with Racket support (newest) @@ -666,7 +658,7 @@ After a successful build, these dlls can be freely removed, leaving them in -10. Building with Lua support +9. Building with Lua support ============================ Vim with Lua support can be built with either MSVC or MinGW (or maybe Cygwin). @@ -721,7 +713,7 @@ Or when using Cygwin (as one line) (untested): LUA=/cygdrive/c/projects/lua53 DYNAMIC_LUA=yes LUA_VER=53 -11. Building with Perl support +10. Building with Perl support ============================== Vim with Perl support can be built with either MSVC or MinGW (or Cygwin). @@ -747,7 +739,7 @@ Or when using MinGW (as one line): PERL=C:/Perl DYNAMIC_PERL=yes PERL_VER=522 -12. Building with Ruby support +11. Building with Ruby support ============================== Vim with Ruby support can be built with either MSVC or MinGW (or Cygwin). @@ -855,7 +847,7 @@ Ruby 2.1 or later. (Default is 0x600.) -13. Building with Tcl support +12. Building with Tcl support ============================= Vim with Tcl support can be built with either MSVC or MinGW (or Cygwin). @@ -894,7 +886,7 @@ Or when using MinGW (as one line): TCL=C:/Tcl86 DYNAMIC_TCL=yes TCL_VER=86 TCL_VER_LONG=8.6 -14. Building with Terminal support +13. Building with Terminal support ================================== Vim with Terminal support can be built with either MSVC, MinGW or Cygwin. @@ -910,7 +902,7 @@ Or when using MinGW: mingw32-make -f Make_ming.mak TERMINAL=yes -15. Building with DirectX (DirectWrite) support +14. Building with DirectX (DirectWrite) support =============================================== Vim with DirectX (DirectWrite) support can be built with either MSVC or MinGW. @@ -944,20 +936,20 @@ Just set DIRECTX to yes: mingw32-make -f Make_ming.mak DIRECTX=yes -16. Windows 3.1x +15. Windows 3.1x ================ The Windows 3.1x support was removed in patch 7.4.1364. -17. MS-DOS +16. MS-DOS ========== The MS-DOS support was removed in patch 7.4.1399. Only very old Vim versions work on MS-DOS because of the limited amount of memory available. -18. Installing after building from sources +17. Installing after building from sources ========================================== [provided by Michael Soyka, updated by Ken Takata] diff --git a/src/Make_bc5.mak b/src/Make_bc5.mak deleted file mode 100644 index a6b4bc96e9..0000000000 --- a/src/Make_bc5.mak +++ /dev/null @@ -1,983 +0,0 @@ -# -# Makefile for Vim. -# Compiler: Borland C++ 5.0 and later 32-bit compiler -# Targets: Win32 (Windows NT and Windows 95) (with/without GUI) -# -# NOTE: THIS IS OLD AND PROBABLY NO LONGER WORKS. -# -# Contributed by Ben Singer. -# Updated 4/1997 by Ron Aaron -# 2016: removed support for 16 bit DOS -# 6/1997 - added support for 16 bit DOS -# Note: this has been tested, and works, for BC5. Your mileage may vary. -# Has been reported NOT to work with BC 4.52. Maybe it can be fixed? -# 10/1997 - ron - fixed bugs w/ BC 5.02 -# 8/1998 - ron - updated with new targets, fixed some stuff -# 3/2000 - Bram: Made it work with BC 5.5 free command line compiler, -# cleaned up variables. -# 6/2001 - Dan - Added support for compiling Python and TCL -# 7/2001 - Dan - Added support for compiling Ruby -# -# It builds on Windows 95 and NT-Intel, producing the same binary in either -# case. To build using Microsoft Visual C++, use Make_mvc.mak. -# -# This should work with the free Borland command line compiler, version 5.5. -# You need at least sp1 (service pack 1). With sp2 it compiles faster. -# Use a command like this: -# <path>\bin\make /f Make_bc5.mak BOR=<path> -# - -# let the make utility do the hard work: -.AUTODEPEND -.CACHEAUTODEPEND - -# VARIABLES: -# name value (default) -# -# BOR path to root of Borland C install (c:\bc5) -# LINK name of the linker ($(BOR)\bin\ilink32) -# GUI no or yes: set to yes if you want the GUI version (yes) -# LUA define to path to Lua dir to get Lua support (not defined) -# LUA_VER define to version of Lua being used (51) -# DYNAMIC_LUA no or yes: set to yes to load the Lua DLL dynamically (no) -# PERL define to path to Perl dir to get Perl support (not defined) -# PERL_VER define to version of Perl being used (56) -# DYNAMIC_PERL no or yes: set to yes to load the Perl DLL dynamically (no) -# PYTHON define to path to Python dir to get PYTHON support (not defined) -# PYTHON_VER define to version of Python being used (22) -# DYNAMIC_PYTHON no or yes: use yes to load the Python DLL dynamically (no) -# PYTHON3 define to path to Python3 dir to get PYTHON3 support (not defined) -# PYTHON3_VER define to version of Python3 being used (31) -# DYNAMIC_PYTHON3 no or yes: use yes to load the Python3 DLL dynamically (no) -# TCL define to path to TCL dir to get TCL support (not defined) -# TCL_VER define to version of TCL being used (83) -# DYNAMIC_TCL no or yes: use yes to load the TCL DLL dynamically (no) -# RUBY define to path to Ruby dir to get Ruby support (not defined) -# NOTE: You may have to remove the defines for uid_t and gid_t -# from the Ruby config.h header file. -# RUBY_VER define to version of Ruby being used (16) -# NOTE: compilation on WinNT/2K/XP requires -# at least version 1.6.5 of Ruby. Earlier versions -# of Ruby will cause a compile error on these systems. -# RUBY_VER_LONG same, but in format with dot. (1.6) -# DYNAMIC_RUBY no or yes: use yes to load the Ruby DLL dynamically (no) -# IME no or yes: set to yes for multi-byte IME support (yes) -# DYNAMIC_IME no or yes: set to yes to load imm32.dll dynamically (yes) -# GETTEXT no or yes: set to yes for multi-language support (yes) -# ICONV no or yes: set to yes for dynamic iconv support (yes) -# OLE no or yes: set to yes to make OLE gvim (no) -# DEBUG no or yes: set to yes if you wish a DEBUGging build (no) -# CODEGUARD no or yes: set to yes if you want to use CODEGUARD (no) -# CPUNR 1 through 6: select -CPU argument to compile with (3) -# 3 for 386, 4 for 486, 5 for pentium, 6 for pentium pro. -# USEDLL no or yes: set to yes to use the Runtime library DLL (no) -# For USEDLL=yes the cc3250.dll is required to run Vim. -# ALIGN 1, 2 or 4: Alignment to use (4 for Win32) -# FASTCALL no or yes: set to yes to use register-based function protocol (yes) -# OPTIMIZE SPACE, SPEED, or MAXSPEED: type of optimization (MAXSPEED) -# POSTSCRIPT no or yes: set to yes for PostScript printing -# FEATURES TINY, SMALL, NORMAL, BIG or HUGE (BIG for WIN32) -# WINVER 0x0400 or 0x0500: minimum Win32 version to support (0x0400) -# CSCOPE no or yes: include support for Cscope interface (yes) -# NETBEANS no or yes: include support for Netbeans interface; also -# requires CHANNEL (yes if GUI -# is yes) -# NBDEBUG no or yes: include support for debugging Netbeans interface (no) -# CHANNEL no or yes: include support for inter process communication (yes -# if GUI is yes) -# XPM define to path to XPM dir to get support for loading XPM images. - -### BOR: root of the BC installation -!if ("$(BOR)"=="") -BOR = c:\bc5 -!endif - -### LINK: Name of the linker: ilink32 (this is below) - -### GUI: yes for GUI version, no for console version -!if ("$(GUI)"=="") -GUI = yes -!endif - -### IME: yes for multibyte support, no to disable it. -!if ("$(IME)"=="") -IME = yes -!endif -!if ("$(DYNAMIC_IME)"=="") -DYNAMIC_IME = yes -!endif - -### GETTEXT: yes for multilanguage support, no to disable it. -!if ("$(GETTEXT)"=="") -GETTEXT = yes -!endif - -### ICONV: yes to enable dynamic-iconv support, no to disable it -!if ("$(ICONV)"=="") -ICONV = yes -!endif - -### CSCOPE: yes to enable Cscope support, no to disable it -!if ("$(CSCOPE)"=="") -CSCOPE = yes -!endif - -### NETBEANS: yes to enable NetBeans interface support, no to disable it -!if ("$(NETBEANS)"=="") && ("$(GUI)"=="yes") -NETBEANS = yes -!endif - -### CHANNEL: yes to enable inter process communication, no to disable it -!if ("$(CHANNEL)"=="") && ("$(GUI)"=="yes") -CHANNEL = yes -!endif - -### LUA: uncomment this line if you want lua support in vim -# LUA=c:\lua - -### PERL: uncomment this line if you want perl support in vim -# PERL=c:\perl - -### PYTHON: uncomment this line if you want python support in vim -# PYTHON=c:\python22 - -### PYTHON3: uncomment this line if you want python3 support in vim -# PYTHON3=c:\python31 - -### RUBY: uncomment this line if you want ruby support in vim -# RUBY=c:\ruby - -### TCL: uncomment this line if you want tcl support in vim -# TCL=c:\tcl - -### OLE: no for normal gvim, yes for OLE-capable gvim (only works with GUI) -#OLE = yes - -### DEBUG: Uncomment to make an executable for debugging -# DEBUG = yes -!if ("$(DEBUG)"=="yes") -DEBUG_FLAG = -v -!endif - -### CODEGUARD: Uncomment to use the CODEGUARD stuff (BC 5.0 or later): -# CODEGUARD = yes -!if ("$(CODEGUARD)"=="yes") -CODEGUARD_FLAG = -vG -!endif - -### CPUNR: set your target processor (3 to 6) -!if ("$(CPUNR)" == "i386") || ("$(CPUNR)" == "3") -CPUNR = 3 -!elif ("$(CPUNR)" == "i486") || ("$(CPUNR)" == "4") -CPUNR = 4 -!elif ("$(CPUNR)" == "i586") || ("$(CPUNR)" == "5") -CPUNR = 5 -!elif ("$(CPUNR)" == "i686") || ("$(CPUNR)" == "6") -CPUNR = 6 -!else -CPUNR = 3 -!endif - -### Comment out to use precompiled headers (faster, but uses lots of disk!) -HEADERS = -H -H=vim.csm -Hc - -### USEDLL: no for statically linked version of run-time, yes for DLL runtime -!if ("$(USEDLL)"=="") -USEDLL = no -!endif - -### ALIGN: alignment you desire: (1,2 or 4: s/b 4 for Win32) -!if ("$(ALIGN)"=="") -ALIGN = 4 -!endif - -### FASTCALL: yes to use FASTCALL calling convention (RECOMMENDED!), no otherwise -# Incompatible when calling external functions (like MSVC-compiled DLLs), so -# don't use FASTCALL when linking with external libs. -!if ("$(FASTCALL)"=="") && \ - ("$(LUA)"=="") && \ - ("$(PYTHON)"=="") && \ - ("$(PYTHON3)"=="") && \ - ("$(PERL)"=="") && \ - ("$(TCL)"=="") && \ - ("$(RUBY)"=="") && \ - ("$(ICONV)"!="yes") && \ - ("$(IME)"!="yes") && \ - ("$(XPM)"=="") -FASTCALL = yes -!endif - -### OPTIMIZE: SPEED to optimize for speed, SPACE otherwise (SPEED RECOMMENDED) -!if ("$(OPTIMIZE)"=="") -OPTIMIZE = MAXSPEED -!endif - -### FEATURES: TINY, SMALL, NORMAL, BIG or HUGE (BIG for WIN32) -!if ("$(FEATURES)"=="") -FEATURES = BIG -!endif - -### POSTSCRIPT: uncomment this line if you want PostScript printing -#POSTSCRIPT = yes - -### -# If you have a fixed directory for $VIM or $VIMRUNTIME, other than the normal -# default, use these lines. -#VIMRCLOC = somewhere -#VIMRUNTIMEDIR = somewhere - -### Set the default $(WINVER) to make it work with Bcc 5.5. -!ifndef WINVER -WINVER = 0x0400 -!endif - -# -# Sanity checks for the above options: -# - -OSTYPE = WIN32 - -# -# Optimizations: change as desired (RECOMMENDATION: Don't change!): -# -!if ("$(DEBUG)"=="yes") -OPT = -Od -N -!else -!if ("$(OPTIMIZE)"=="SPACE") -OPT = -O1 -f- -d -!elif ("$(OPTIMIZE)"=="MAXSPEED") -OPT = -O2 -f- -d -Ocavi -O -!else -OPT = -O2 -f- -d -Oc -O -!endif -!if ("$(FASTCALL)"=="yes") -OPT = $(OPT) -pr -!endif -!if ("$(CODEGUARD)"!="yes") -OPT = $(OPT) -vi- -!endif -!endif -# shouldn't have to change: -LIB = $(BOR)\lib -INCLUDE = $(BOR)\include;.;proto -DEFINES = -DFEAT_$(FEATURES) -DWIN32 -DHAVE_PATHDEF \ - -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) - -!ifdef LUA -INTERP_DEFINES = $(INTERP_DEFINES) -DFEAT_LUA -INCLUDE = $(LUA)\include;$(INCLUDE) -! ifndef LUA_VER -LUA_VER = 51 -! endif -! if ("$(DYNAMIC_LUA)" == "yes") -INTERP_DEFINES = $(INTERP_DEFINES) -DDYNAMIC_LUA -DDYNAMIC_LUA_DLL=\"lua$(LUA_VER).dll\" -LUA_LIB_FLAG = /nodefaultlib: -! endif -!endif - -!ifdef PERL -INTERP_DEFINES = $(INTERP_DEFINES) -DFEAT_PERL -INCLUDE = $(PERL)\lib\core;$(INCLUDE) -! ifndef PERL_VER -PERL_VER = 56 -! endif -! if ("$(DYNAMIC_PERL)" == "yes") -! if ($(PERL_VER) > 55) -INTERP_DEFINES = $(INTERP_DEFINES) -DDYNAMIC_PERL -DDYNAMIC_PERL_DLL=\"perl$(PERL_VER).dll\" -PERL_LIB_FLAG = /nodefaultlib: -! else -! message "Cannot dynamically load Perl versions less than 5.6. Loading statically..." -! endif -! endif -!endif - -!ifdef PYTHON -!ifdef PYTHON3 -DYNAMIC_PYTHON=yes -DYNAMIC_PYTHON3=yes -!endif -!endif - -!ifdef PYTHON -INTERP_DEFINES = $(INTERP_DEFINES) -DFEAT_PYTHON -!ifndef PYTHON_VER -PYTHON_VER = 22 -!endif -!if "$(DYNAMIC_PYTHON)" == "yes" -INTERP_DEFINES = $(INTERP_DEFINES) -DDYNAMIC_PYTHON -DDYNAMIC_PYTHON_DLL=\"python$(PYTHON_VER).dll\" -PYTHON_LIB_FLAG = /nodefaultlib: -!endif -!endif - -!ifdef PYTHON3 -INTERP_DEFINES = $(INTERP_DEFINES) -DFEAT_PYTHON3 -!ifndef PYTHON3_VER -PYTHON3_VER = 31 -!endif -!if "$(DYNAMIC_PYTHON3)" == "yes" -INTERP_DEFINES = $(INTERP_DEFINES) -DDYNAMIC_PYTHON3 -DDYNAMIC_PYTHON3_DLL=\"python$(PYTHON3_VER).dll\" -PYTHON3_LIB_FLAG = /nodefaultlib: -!endif -!endif - - -!ifdef RUBY -!ifndef RUBY_VER -RUBY_VER = 16 -!endif -!ifndef RUBY_VER_LONG -RUBY_VER_LONG = 1.6 -!endif - -!if "$(RUBY_VER)" == "16" -!ifndef RUBY_PLATFORM -RUBY_PLATFORM = i586-mswin32 -!endif -!ifndef RUBY_INSTALL_NAME -RUBY_INSTALL_NAME = mswin32-ruby$(RUBY_VER) -!endif -!else -!ifndef RUBY_PLATFORM -RUBY_PLATFORM = i386-mswin32 -!endif -!ifndef RUBY_INSTALL_NAME -RUBY_INSTALL_NAME = msvcrt-ruby$(RUBY_VER) -!endif -!endif - -INTERP_DEFINES = $(INTERP_DEFINES) -DFEAT_RUBY -INCLUDE = $(RUBY)\lib\ruby\$(RUBY_VER_LONG)\$(RUBY_PLATFORM);$(INCLUDE) - -!if "$(DYNAMIC_RUBY)" == "yes" -INTERP_DEFINES = $(INTERP_DEFINES) -DDYNAMIC_RUBY -DDYNAMIC_RUBY_DLL=\"$(RUBY_INSTALL_NAME).dll\" -INTERP_DEFINES = $(INTERP_DEFINES) -DDYNAMIC_RUBY_VER=$(RUBY_VER) -RUBY_LIB_FLAG = /nodefaultlib: -!endif -!endif - -!ifdef TCL -INTERP_DEFINES = $(INTERP_DEFINES) -DFEAT_TCL -INCLUDE = $(TCL)\include;$(INCLUDE) -!ifndef TCL_VER -TCL_VER = 83 -!endif -TCL_LIB = $(TCL)\lib\tcl$(TCL_VER).lib -TCL_LIB_FLAG = -!if "$(DYNAMIC_TCL)" == "yes" -INTERP_DEFINES = $(INTERP_DEFINES) -DDYNAMIC_TCL -DDYNAMIC_TCL_DLL=\"tcl$(TCL_VER).dll\" -TCL_LIB = tclstub$(TCL_VER)-bor.lib -TCL_LIB_FLAG = -!endif -!endif -# -# DO NOT change below: -# -CPUARG = -$(CPUNR) -ALIGNARG = -a$(ALIGN) -# -!if ("$(DEBUG)"=="yes") -DEFINES=$(DEFINES) -DDEBUG -D_DEBUG -!endif -# -!if ("$(OLE)"=="yes") -DEFINES = $(DEFINES) -DFEAT_OLE -!endif -# -!if ("$(IME)"=="yes") -MBDEFINES = $(MBDEFINES) -DFEAT_MBYTE_IME -!if ("$(DYNAMIC_IME)" == "yes") -MBDEFINES = $(MBDEFINES) -DDYNAMIC_IME -!endif -!endif -!if ("$(ICONV)"=="yes") -MBDEFINES = $(MBDEFINES) -DDYNAMIC_ICONV -!endif -!if ("$(GETTEXT)"=="yes") -MBDEFINES = $(MBDEFINES) -DDYNAMIC_GETTEXT -!endif - -!if ("$(CSCOPE)"=="yes") -DEFINES = $(DEFINES) -DFEAT_CSCOPE -!endif - -!if ("$(GUI)"=="yes") -DEFINES = $(DEFINES) -DFEAT_GUI_MSWIN -DFEAT_CLIPBOARD -!if ("$(DEBUG)"=="yes") -TARGET = gvimd.exe -!else -TARGET = gvim.exe -!endif -EXETYPE=-W -STARTUPOBJ = c0w32.obj -LINK2 = -aa -RESFILE = vim.res -!else -!undef NETBEANS -!undef CHANNEL -!undef XPM -!if ("$(DEBUG)"=="yes") -TARGET = vimd.exe -!else -# for now, anyway: VIMDLL is only for the GUI version -TARGET = vim.exe -!endif -EXETYPE=-WC -STARTUPOBJ = c0x32.obj -LINK2 = -ap -OS -o -P -RESFILE = vim.res -!endif - -!if ("$(NETBEANS)"=="yes") -!if ("$(CHANNEL)"!="yes") -# cannot use Netbeans without CHANNEL -NETBEANS = no -!else -DEFINES = $(DEFINES) -DFEAT_NETBEANS_INTG -!if ("$(NBDEBUG)"=="yes") -DEFINES = $(DEFINES) -DNBDEBUG -NBDEBUG_DEP = nbdebug.h nbdebug.c -!endif -!endif -!endif - -!if ("$(CHANNEL)"=="yes") -DEFINES = $(DEFINES) -DFEAT_JOB_CHANNEL -!endif - -!ifdef XPM -!if ("$(GUI)"=="yes") -DEFINES = $(DEFINES) -DFEAT_XPM_W32 -INCLUDE = $(XPM)\include;$(INCLUDE) -!endif -!endif - -!if ("$(USEDLL)"=="yes") -DEFINES = $(DEFINES) -D_RTLDLL -!endif - -!if ("$(DEBUG)"=="yes") -OBJDIR = $(OSTYPE)\objdbg -!else -!if ("$(GUI)"=="yes") -!if ("$(OLE)"=="yes") -OBJDIR = $(OSTYPE)\oleobj -!else -OBJDIR = $(OSTYPE)\gobj -!endif -!else -OBJDIR = $(OSTYPE)\obj -!endif -!endif - -!if ("$(POSTSCRIPT)"=="yes") -DEFINES = $(DEFINES) -DMSWINPS -!endif - -##### BASE COMPILER/TOOLS RULES ##### -MAKE = $(BOR)\bin\make -CFLAGS = -w-aus -w-par -w-pch -w-ngu -w-csu -I$(INCLUDE) -BRC = $(BOR)\BIN\brc32 -!if ("$(LINK)"=="") -LINK = $(BOR)\BIN\ILink32 -!endif -CC = $(BOR)\BIN\Bcc32 -LFLAGS = -OS -Tpe |