From eae1b91fea74842000fc055afc74fe2e7934c6ee Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 9 May 2019 15:12:55 +0200 Subject: patch 8.1.1306: Borland support is outdated and doesn't work Problem: Borland support is outdated and doesn't work. Solution: Remove Borland support, there are other (free) compilers available. (Thomas Dziedzic, Ken Takata, closes #4364) --- src/GvimExt/Make_bc5.mak | 43 ------------------------------------------- src/GvimExt/gvimext.cpp | 9 --------- src/GvimExt/gvimext.rc | 4 +--- 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 src/GvimExt/Make_bc5.mak (limited to 'src/GvimExt') 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 -# 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 -- cgit v1.2.3