aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj2
-rw-r--r--gtk/makefile14
-rw-r--r--qt/ScintillaEdit/ScintillaEdit.pro2
-rw-r--r--qt/ScintillaEditBase/ScintillaEditBase.pro2
-rw-r--r--qt/ScintillaEditPy/ScintillaEditPy.pro2
-rw-r--r--win32/DepGen.py6
-rw-r--r--win32/Scintilla.vcxproj6
-rw-r--r--win32/deps.mak37
-rw-r--r--win32/makefile23
-rw-r--r--win32/nmdeps.mak37
-rw-r--r--win32/scintilla.mak40
11 files changed, 14 insertions, 157 deletions
diff --git a/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj b/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
index 543539eb6..f13af73f4 100644
--- a/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
+++ b/cocoa/Scintilla/Scintilla.xcodeproj/project.pbxproj
@@ -647,7 +647,6 @@
HEADER_SEARCH_PATHS = (
../../include,
../../src,
- ../../lexlib,
);
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -682,7 +681,6 @@
HEADER_SEARCH_PATHS = (
../../include,
../../src,
- ../../lexlib,
);
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
diff --git a/gtk/makefile b/gtk/makefile
index 8967a16b8..1befa1183 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -69,12 +69,12 @@ endif
COMPLIB=$(basedir)/bin/scintilla.a
COMPONENT=$(basedir)/bin/libscintilla.$(SHAREDEXTENSION)
-vpath %.h $(srcdir) $(basedir)/src $(basedir)/include $(basedir)/lexlib
+vpath %.h $(srcdir) $(basedir)/src $(basedir)/include
vpath %.c $(srcdir)
-vpath %.cxx $(srcdir) $(basedir)/src $(basedir)/lexlib $(basedir)/lexers
+vpath %.cxx $(srcdir) $(basedir)/src
-INCLUDES=-I $(basedir)/include -I $(basedir)/src -I $(basedir)/lexlib
-DEFINES += -DGTK -DSCI_LEXER
+INCLUDES=-I $(basedir)/include -I $(basedir)/src
+DEFINES += -DGTK
BASE_FLAGS += $(WARNINGS)
ifdef NO_CXX11_REGEX
@@ -167,11 +167,5 @@ $(COMPLIB): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER) $(LEX_OBJS)
$(COMPONENT): $(SRC_OBJS) $(GTK_OBJS) $(MARSHALLER)
$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(CONFIGLIB)
-Catalogue.o: Catalogue.cxx
- $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -D SCI_EMPTYCATALOGUE -c $< -o $@
-
-CatalogueL.o: Catalogue.cxx
- $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@
-
# Automatically generate header dependencies with "make deps"
include deps.mak
diff --git a/qt/ScintillaEdit/ScintillaEdit.pro b/qt/ScintillaEdit/ScintillaEdit.pro
index 65810425f..22153dcec 100644
--- a/qt/ScintillaEdit/ScintillaEdit.pro
+++ b/qt/ScintillaEdit/ScintillaEdit.pro
@@ -62,7 +62,7 @@ OTHER_FILES +=
INCLUDEPATH += ../ScintillaEditBase ../../include ../../src
-DEFINES += SCINTILLA_QT=1 MAKING_LIBRARY=1 SCI_LEXER=1 _CRT_SECURE_NO_DEPRECATE=1
+DEFINES += SCINTILLA_QT=1 MAKING_LIBRARY=1 _CRT_SECURE_NO_DEPRECATE=1
CONFIG(release, debug|release) {
DEFINES += NDEBUG=1
}
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.pro b/qt/ScintillaEditBase/ScintillaEditBase.pro
index 5817dc0cb..3e913d887 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.pro
+++ b/qt/ScintillaEditBase/ScintillaEditBase.pro
@@ -91,7 +91,7 @@ OTHER_FILES +=
INCLUDEPATH += ../../include ../../src
-DEFINES += SCINTILLA_QT=1 MAKING_LIBRARY=1 SCI_LEXER=1 _CRT_SECURE_NO_DEPRECATE=1
+DEFINES += SCINTILLA_QT=1 MAKING_LIBRARY=1 _CRT_SECURE_NO_DEPRECATE=1
CONFIG(release, debug|release) {
DEFINES += NDEBUG=1
}
diff --git a/qt/ScintillaEditPy/ScintillaEditPy.pro b/qt/ScintillaEditPy/ScintillaEditPy.pro
index eaf4aceda..96f3ae8e7 100644
--- a/qt/ScintillaEditPy/ScintillaEditPy.pro
+++ b/qt/ScintillaEditPy/ScintillaEditPy.pro
@@ -110,7 +110,7 @@ HEADERS += \
../ScintillaEditBase/ScintillaQt.h \
../ScintillaEditBase/ScintillaEditBase.h
-DEFINES += SCINTILLA_QT=1 MAKING_LIBRARY=1 SCI_LEXER=1 _CRT_SECURE_NO_DEPRECATE=1
+DEFINES += SCINTILLA_QT=1 MAKING_LIBRARY=1 _CRT_SECURE_NO_DEPRECATE=1
CONFIG(release, debug|release) {
DEFINES += NDEBUG=1
}
diff --git a/win32/DepGen.py b/win32/DepGen.py
index 72ae027a5..f2cbb4838 100644
--- a/win32/DepGen.py
+++ b/win32/DepGen.py
@@ -19,12 +19,6 @@ def Generate():
# Create the dependencies file for g++
deps = Dependencies.FindDependencies(["../win32/*.cxx"] + sources, ["../win32"] + includes, ".o", "../win32/")
- # Add ScintillaBaseL as the same as ScintillaBase
- deps = Dependencies.InsertSynonym(deps, "ScintillaBase.o", "ScintillaBaseL.o")
-
- # Add CatalogueL as the same as Catalogue
- deps = Dependencies.InsertSynonym(deps, "Catalogue.o", "CatalogueL.o")
-
Dependencies.UpdateDependencies("../win32/deps.mak", deps, topComment)
# Create the dependencies file for MSVC
diff --git a/win32/Scintilla.vcxproj b/win32/Scintilla.vcxproj
index 746da1b03..e6bc39949 100644
--- a/win32/Scintilla.vcxproj
+++ b/win32/Scintilla.vcxproj
@@ -84,8 +84,8 @@
<ItemDefinitionGroup>
<ClCompile>
<WarningLevel>Level4</WarningLevel>
- <PreprocessorDefinitions>SCI_EMPTYCATALOGUE;SCI_LEXER;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\include;..\src;..\lexlib;</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>SCI_EMPTYCATALOGUE;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\include;..\src;</AdditionalIncludeDirectories>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<MinimalRebuild>false</MinimalRebuild>
@@ -162,7 +162,6 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\lexlib\*.cxx" />
<ClCompile Include="..\src\*.cxx" />
<ClCompile Include="..\win32\HanjaDic.cxx" />
<ClCompile Include="..\win32\PlatWin.cxx" />
@@ -172,7 +171,6 @@
<ItemGroup>
<ClInclude Include="..\include\*.h" />
<ClInclude Include="..\src\*.h" />
- <ClInclude Include="..\lexlib\*.h" />
<ClInclude Include="..\win32\*.h" />
</ItemGroup>
<ItemGroup>
diff --git a/win32/deps.mak b/win32/deps.mak
index 474551cc4..c932250fb 100644
--- a/win32/deps.mak
+++ b/win32/deps.mak
@@ -404,43 +404,6 @@ ScintillaBase.o: \
../src/Editor.h \
../src/AutoComplete.h \
../src/ScintillaBase.h
-ScintillaBaseL.o: \
- ../src/ScintillaBase.cxx \
- ../include/ScintillaTypes.h \
- ../include/ScintillaMessages.h \
- ../include/ScintillaStructures.h \
- ../include/ILoader.h \
- ../include/Sci_Position.h \
- ../include/ILexer.h \
- ../src/Debugging.h \
- ../src/Geometry.h \
- ../src/Platform.h \
- ../src/CharacterCategoryMap.h \
- ../src/Position.h \
- ../src/UniqueString.h \
- ../src/SplitVector.h \
- ../src/Partitioning.h \
- ../src/RunStyles.h \
- ../src/ContractionState.h \
- ../src/CellBuffer.h \
- ../src/CallTip.h \
- ../src/KeyMap.h \
- ../src/Indicator.h \
- ../src/LineMarker.h \
- ../src/Style.h \
- ../src/ViewStyle.h \
- ../src/CharClassify.h \
- ../src/Decoration.h \
- ../src/CaseFolder.h \
- ../src/Document.h \
- ../src/Selection.h \
- ../src/PositionCache.h \
- ../src/EditModel.h \
- ../src/MarginView.h \
- ../src/EditView.h \
- ../src/Editor.h \
- ../src/AutoComplete.h \
- ../src/ScintillaBase.h
Selection.o: \
../src/Selection.cxx \
../src/Debugging.h \
diff --git a/win32/makefile b/win32/makefile
index 9a49602ef..c09d8d74a 100644
--- a/win32/makefile
+++ b/win32/makefile
@@ -41,13 +41,13 @@ else
DEL = rm -f
endif
-vpath %.h ../src ../include ../lexlib
-vpath %.cxx ../src ../lexlib ../lexers
+vpath %.h ../src ../include
+vpath %.cxx ../src
LDFLAGS=-shared -static -mwindows
LIBS=-lgdi32 -luser32 -limm32 -lole32 -luuid -loleaut32 -lmsimg32 $(LIBSMINGW)
-INCLUDES=-I ../include -I ../src -I../lexlib
+INCLUDES=-I ../include -I ../src
BASE_FLAGS += $(WARNINGS)
@@ -112,14 +112,6 @@ SRC_OBJS = \
ViewStyle.o \
XPM.o
-# Required by libraries and DLLs that include lexing
-SCILEX_OBJS=\
- $(SRC_OBJS) \
- HanjaDic.o \
- PlatWin.o \
- ScintillaBaseL.o \
- ScintillaWin.o
-
COMPONENT_OBJS = \
$(SRC_OBJS) \
HanjaDic.o \
@@ -139,15 +131,6 @@ $(LIBSCI): $(COMPONENT_OBJS)
# Automatically generate dependencies for most files with "make deps"
include deps.mak
-ScintillaBaseL.o:
- $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@
-
-Catalogue.o: Catalogue.cxx
- $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -D SCI_EMPTYCATALOGUE -c $< -o $@
-
-CatalogueL.o: Catalogue.cxx
- $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@
-
ScintRes.o: ScintRes.rc
$(WINDRES) ScintRes.rc $@
diff --git a/win32/nmdeps.mak b/win32/nmdeps.mak
index 47c5f97f8..51404eb9d 100644
--- a/win32/nmdeps.mak
+++ b/win32/nmdeps.mak
@@ -404,43 +404,6 @@ $(DIR_O)/ScintillaBase.obj: \
../src/Editor.h \
../src/AutoComplete.h \
../src/ScintillaBase.h
-$(DIR_O)/ScintillaBaseL.obj: \
- ../src/ScintillaBase.cxx \
- ../include/ScintillaTypes.h \
- ../include/ScintillaMessages.h \
- ../include/ScintillaStructures.h \
- ../include/ILoader.h \
- ../include/Sci_Position.h \
- ../include/ILexer.h \
- ../src/Debugging.h \
- ../src/Geometry.h \
- ../src/Platform.h \
- ../src/CharacterCategoryMap.h \
- ../src/Position.h \
- ../src/UniqueString.h \
- ../src/SplitVector.h \
- ../src/Partitioning.h \
- ../src/RunStyles.h \
- ../src/ContractionState.h \
- ../src/CellBuffer.h \
- ../src/CallTip.h \
- ../src/KeyMap.h \
- ../src/Indicator.h \
- ../src/LineMarker.h \
- ../src/Style.h \
- ../src/ViewStyle.h \
- ../src/CharClassify.h \
- ../src/Decoration.h \
- ../src/CaseFolder.h \
- ../src/Document.h \
- ../src/Selection.h \
- ../src/PositionCache.h \
- ../src/EditModel.h \
- ../src/MarginView.h \
- ../src/EditView.h \
- ../src/Editor.h \
- ../src/AutoComplete.h \
- ../src/ScintillaBase.h
$(DIR_O)/Selection.obj: \
../src/Selection.cxx \
../src/Debugging.h \
diff --git a/win32/scintilla.mak b/win32/scintilla.mak
index cf272173b..ed40818ef 100644
--- a/win32/scintilla.mak
+++ b/win32/scintilla.mak
@@ -62,7 +62,7 @@ LDFLAGS=$(LDDEBUG) $(LDFLAGS)
CXXFLAGS=$(CXXFLAGS) $(CXXNDEBUG)
!ENDIF
-INCLUDES=-I../include -I../src -I../lexlib
+INCLUDES=-I../include -I../src
CXXFLAGS=$(CXXFLAGS) $(INCLUDES)
all: $(COMPONENT) $(LIBSCI)
@@ -70,7 +70,7 @@ all: $(COMPONENT) $(LIBSCI)
clean:
-del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(DIR_O)\*.asm $(COMPONENT) \
$(DIR_O)\*.res $(DIR_BIN)\*.map $(DIR_BIN)\*.exp $(DIR_BIN)\*.pdb \
- $(DIR_BIN)\Scintilla.lib $(DIR_BIN)\SciLexer.lib $(LIBSCI)
+ $(DIR_BIN)\Scintilla.lib $(LIBSCI)
depend:
pyw DepGen.py
@@ -108,28 +108,6 @@ SRC_OBJS=\
$(DIR_O)\ViewStyle.obj \
$(DIR_O)\XPM.obj
-# Required by lexers
-LEXLIB_OBJS = \
- $(DIR_O)\Accessor.obj \
- $(DIR_O)\CatalogueL.obj \
- $(DIR_O)\ExternalLexer.obj \
- $(DIR_O)\DefaultLexer.obj \
- $(DIR_O)\LexerBase.obj \
- $(DIR_O)\LexerModule.obj \
- $(DIR_O)\LexerSimple.obj \
- $(DIR_O)\StyleContext.obj \
- $(DIR_O)\WordList.obj
-
-# Required by libraries and DLLs that include lexing
-SCILEX_OBJS = \
- $(SRC_OBJS) \
- $(LEXLIB_OBJS) \
- $(LEX_OBJS) \
- $(DIR_O)\HanjaDic.obj \
- $(DIR_O)\PlatWin.obj \
- $(DIR_O)\ScintillaBaseL.obj \
- $(DIR_O)\ScintillaWin.obj
-
COMPONENT_OBJS = \
$(DIR_O)\HanjaDic.obj \
$(DIR_O)\PlatWin.obj \
@@ -151,23 +129,9 @@ $(LIBSCI): $(COMPONENT_OBJS)
{..\src}.cxx{$(DIR_O)}.obj::
$(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $<
-{..\lexlib}.cxx{$(DIR_O)}.obj::
- $(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $<
-{..\lexers}.cxx{$(DIR_O)}.obj::
- $(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $<
{.}.cxx{$(DIR_O)}.obj::
$(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $<
-# Some source files are compiled into more than one object because of different conditional compilation
-$(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx
- $(CXX) $(CXXFLAGS) -DSCI_LEXER -c $(NAME)$@ ..\src\ScintillaBase.cxx
-
-$(DIR_O)\CatalogueL.obj: ..\src\Catalogue.cxx
- $(CXX) $(CXXFLAGS) -DSCI_LEXER -c $(NAME)$@ ..\src\Catalogue.cxx
-
-$(DIR_O)\Catalogue.obj: ..\src\Catalogue.cxx
- $(CXX) $(CXXFLAGS) -DSCI_LEXER -DSCI_EMPTYCATALOGUE -c $(NAME)$@ ..\src\Catalogue.cxx
-
# Dependencies
!IF EXISTS(nmdeps.mak)
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-11 10:36:51 +0000