aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--README8
-rw-r--r--lexers/LexCPP.cxx4
-rw-r--r--src/Document.cxx8
-rw-r--r--src/Editor.cxx8
-rw-r--r--src/LexGen.py4
-rw-r--r--win32/PlatWin.cxx2
-rw-r--r--win32/ScintillaWin.cxx6
-rw-r--r--win32/scintilla.mak60
8 files changed, 16 insertions, 84 deletions
diff --git a/README b/README
index 7690bcc96..d7efc6908 100644
--- a/README
+++ b/README
@@ -40,27 +40,23 @@ The current make file only supports static linking between SciTE and Scintilla.
*** Windows version ***
-A C++ compiler is required. Visual Studio .NET 2008 is the development system
+A C++ compiler is required. Visual Studio .NET 2010 is the development system
used for most development although TDM Mingw32 4.4.1 is also supported.
-For older versions of Borland C++ such as version 5.02, add the -l option.
To build Scintilla, make in the scintilla/win32 directory
cd scintilla\win32
GCC: mingw32-make
VS .NET: nmake -f scintilla.mak
-VC++ 6: nmake -f scintilla_vc6.mak
-Borland: make -fscintilla.mak
cd ..\..
To build SciTE, use the makefiles located in the scite/win32 directory
cd scite\win32
GCC: mingw32-make
VS .NET: nmake -f scite.mak
-Borland: make -fscite.mak
An executable SciTE will now be in scite\bin.
-The Visual C++ 6.0 project (.dsp) files are no longer supported but are left
+The Visual C++ 6.0 project (.dsp) and make files are no longer supported but are left
in the download for people that are prepared to update them.
*** GTK+/Windows version ***
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
index bc7bb3702..68859ec3b 100644
--- a/lexers/LexCPP.cxx
+++ b/lexers/LexCPP.cxx
@@ -15,10 +15,6 @@
#ifdef _MSC_VER
#pragma warning(disable: 4786)
#endif
-#ifdef __BORLANDC__
-// Borland C++ displays warnings in vector header without this
-#pragma option -w-ccc -w-rch
-#endif
#include <string>
#include <vector>
diff --git a/src/Document.cxx b/src/Document.cxx
index b70024f34..3865c6c3d 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -14,14 +14,6 @@
#include <string>
#include <vector>
-// With Borland C++ 5.5, including <string> includes Windows.h leading to defining
-// FindText to FindTextA which makes calls here to Document::FindText fail.
-#ifdef __BORLANDC__
-#ifdef FindText
-#undef FindText
-#endif
-#endif
-
#include "Platform.h"
#include "ILexer.h"
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 0b78f8f0a..01415ec88 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -16,14 +16,6 @@
#include <algorithm>
#include <memory>
-// With Borland C++ 5.5, including <string> includes Windows.h leading to defining
-// FindText to FindTextA which makes calls here to Document::FindText fail.
-#ifdef __BORLANDC__
-#ifdef FindText
-#undef FindText
-#endif
-#endif
-
#include "Platform.h"
#include "ILexer.h"
diff --git a/src/LexGen.py b/src/LexGen.py
index 5084596c6..d4ff21555 100644
--- a/src/LexGen.py
+++ b/src/LexGen.py
@@ -295,8 +295,8 @@ def RegenerateAll():
Regenerate(root + "scintilla/win32/scintilla.mak", "#", NATIVE, lexFiles)
Regenerate(root + "scintilla/win32/scintilla_vc6.mak", "#", NATIVE, lexFiles)
if os.path.exists(root + "scite"):
- Regenerate(root + "scite/win32/makefile", "#", NATIVE, lexFiles, propFiles)
- Regenerate(root + "scite/win32/scite.mak", "#", NATIVE, lexFiles, propFiles)
+ Regenerate(root + "scite/win32/makefile", "#", NATIVE, propFiles)
+ Regenerate(root + "scite/win32/scite.mak", "#", NATIVE, propFiles)
Regenerate(root + "scite/src/SciTEProps.cxx", "//", NATIVE, lexerProperties)
Regenerate(root + "scite/doc/SciTEDoc.html", "<!--", NATIVE, propertiesHTML)
Generate(root + "scite/boundscheck/vcproj.gen",
diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx
index 0421e5985..0bae1bef2 100644
--- a/win32/PlatWin.cxx
+++ b/win32/PlatWin.cxx
@@ -27,7 +27,7 @@
// We want to use multi monitor functions, but via LoadLibrary etc
// Luckily microsoft has done the heavy lifting for us, so we'll just use their stub functions!
-#if (defined(_MSC_VER) && (MSC_VER > 1200)) || defined(__BORLANDC__)
+#if defined(_MSC_VER) && (MSC_VER > 1200)
#define COMPILE_MULTIMON_STUBS
#include "MultiMon.h"
#endif
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 7f7f4e980..99ba47ff9 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -75,11 +75,9 @@
#endif
#include <commctrl.h>
-#ifndef __BORLANDC__
#ifndef __DMC__
#include <zmouse.h>
#endif
-#endif
#include <ole2.h>
#ifndef MK_ALT
@@ -1375,12 +1373,12 @@ public:
LCMAP_LINGUISTIC_CASING | LCMAP_LOWERCASE,
&utf16Mixed[0], nUtf16Mixed, &utf16Folded[0], utf16Folded.size());
- size_t lenOut = ::WideCharToMultiByte(cp, 0,
+ size_t lenOut = ::WideCharToMultiByte(cp, 0,
&utf16Folded[0], lenFlat,
NULL, 0, NULL, 0);
if (lenOut < sizeFolded) {
- ::WideCharToMultiByte(cp, 0,
+ ::WideCharToMultiByte(cp, 0,
&utf16Folded[0], lenFlat,
folded, lenOut, NULL, 0);
return lenOut;
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index e4a53a381..0af959fb3 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -1,15 +1,11 @@
-# Make file for Scintilla on Windows Visual C++ and Borland C++ version
-# Copyright 1998-2009 by Neil Hodgson <neilh@scintilla.org>
+# Make file for Scintilla on Windows Visual C++ version
+# Copyright 1998-2010 by Neil Hodgson <neilh@scintilla.org>
# The License.txt file describes the conditions under which this software may be distributed.
-# This makefile is for using Visual C++ with nmake or Borland C++ with make depending on
-# the setting of the VENDOR macro. If no VENDOR is defined n the command line then
-# the tool used is automatically detected.
+# This makefile is for using Visual C++ with nmake.
# Usage for Microsoft:
# nmake -f scintilla.mak
-# Usage for Borland:
-# make -f scintilla.mak
-# For debug versions define DEBUG on the command line, for Borland:
-# make DEBUG=1 -f scintilla.mak
+# For debug versions define DEBUG on the command line:
+# nmake DEBUG=1 -f scintilla.mak
# The main makefile uses mingw32 gcc and may be more current than this file.
.SUFFIXES: .cxx
@@ -19,17 +15,7 @@ DIR_BIN=..\bin
COMPONENT=$(DIR_BIN)\Scintilla.dll
LEXCOMPONENT=$(DIR_BIN)\SciLexer.dll
-
-!IFNDEF VENDOR
-!IFDEF _NMAKE_VER
-#Microsoft nmake so make default VENDOR MICROSOFT
-VENDOR=MICROSOFT
-!ELSE
-VENDOR=BORLAND
-!ENDIF
-!ENDIF
-
-!IF "$(VENDOR)"=="MICROSOFT"
+LEXLIB=Lexers.lib
CC=cl
RC=rc
@@ -45,25 +31,6 @@ LDDEBUG=
LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.LIB
NOLOGO=-nologo
-!ELSE
-# BORLAND
-
-CC=bcc32
-RC=brcc32 -r
-LD=ilink32
-
-CXXFLAGS=-P -tWM -w -w-prc -w-inl -w-pin -RT-
-# Above turns off warnings for clarfying parentheses and inlines with for not expanded
-CXXDEBUG=-Od -v -DDEBUG
-CXXNDEBUG=-O1 -DNDEBUG
-NAME=-o
-LDFLAGS=-Gn -x -c
-LDDEBUG=-v
-LIBS=import32 cw32mt
-NOLOGO=-q
-
-!ENDIF
-
!IFDEF QUIET
CC=@$(CC)
CXXFLAGS=$(CXXFLAGS) $(NOLOGO)
@@ -80,7 +47,7 @@ CXXFLAGS=$(CXXFLAGS) $(CXXNDEBUG)
INCLUDEDIRS=-I../include -I../src -I../lexlib
CXXFLAGS=$(CXXFLAGS) $(INCLUDEDIRS)
-ALL: $(COMPONENT) $(LEXCOMPONENT) $(DIR_O)\ScintillaWinS.obj
+ALL: $(COMPONENT) $(LEXCOMPONENT) $(LEXLIB) $(DIR_O)\ScintillaWinS.obj
clean:
-del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(COMPONENT) $(LEXCOMPONENT) \
@@ -238,23 +205,14 @@ LOBJS=\
$(DIR_O)\ScintRes.res : ScintRes.rc
$(RC) -fo$@ $**
-!IF "$(VENDOR)"=="MICROSOFT"
-
$(COMPONENT): $(SOBJS) $(DIR_O)\ScintRes.res
$(LD) $(LDFLAGS) -DEF:Scintilla.def -DLL -OUT:$@ $** $(LIBS)
$(LEXCOMPONENT): $(LOBJS) $(DIR_O)\ScintRes.res
$(LD) $(LDFLAGS) -DEF:Scintilla.def -DLL -OUT:$@ $** $(LIBS)
-!ELSE
-
-$(COMPONENT): $(SOBJS) $(DIR_O)\ScintRes.res
- $(LD) $(LDFLAGS) -Tpd c0d32 $(SOBJS), $@, , $(LIBS), , $(DIR_O)\ScintRes.res
-
-$(LEXCOMPONENT): $(LOBJS) $(DIR_O)\ScintRes.res
- $(LD) $(LDFLAGS) -Tpd c0d32 $(LOBJS), $@, , $(LIBS), , $(DIR_O)\ScintRes.res
-
-!ENDIF
+$(LEXLIB): $(LEXOBJS)
+ LIB /OUT:$@ $(LEXOBJS)
# Define how to build all the objects and what they depend on