diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/DepGen.py | 3 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 3 | ||||
| -rw-r--r-- | win32/deps.mak | 40 | ||||
| -rw-r--r-- | win32/makefile | 5 | ||||
| -rw-r--r-- | win32/nmdeps.mak | 40 | ||||
| -rw-r--r-- | win32/scintilla.mak | 13 |
6 files changed, 4 insertions, 100 deletions
diff --git a/win32/DepGen.py b/win32/DepGen.py index 3abf68936..c255574b0 100644 --- a/win32/DepGen.py +++ b/win32/DepGen.py @@ -22,9 +22,6 @@ def Generate(): # Add ScintillaBaseL as the same as ScintillaBase deps = Dependencies.InsertSynonym(deps, "ScintillaBase.o", "ScintillaBaseL.o") - # Add ScintillaWinL as the same as ScintillaWin - deps = Dependencies.InsertSynonym(deps, "ScintillaWin.o", "ScintillaWinL.o") - Dependencies.UpdateDependencies("../win32/deps.mak", deps, topComment) # Create the dependencies file for MSVC diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index bb99166c6..99a54c1aa 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -3465,9 +3465,6 @@ LRESULT PASCAL ScintillaWin::SWndProc( int Scintilla_RegisterClasses(void *hInstance) { Platform_Initialise(hInstance); const bool result = ScintillaWin::Register(static_cast<HINSTANCE>(hInstance)); -#ifdef SCI_LEXER - Scintilla_LinkLexers(); -#endif return result; } diff --git a/win32/deps.mak b/win32/deps.mak index b7f4024cd..4eed6cc45 100644 --- a/win32/deps.mak +++ b/win32/deps.mak @@ -55,45 +55,6 @@ ScintillaWin.o: \ PlatWin.h \ HanjaDic.h \ ScintillaWin.h -ScintillaWinL.o: \ - ScintillaWin.cxx \ - ../include/Platform.h \ - ../include/ILoader.h \ - ../include/Sci_Position.h \ - ../include/ILexer.h \ - ../include/Scintilla.h \ - ../lexlib/CharacterCategory.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/CaseConvert.h \ - ../src/UniConversion.h \ - ../src/Selection.h \ - ../src/PositionCache.h \ - ../src/EditModel.h \ - ../src/MarginView.h \ - ../src/EditView.h \ - ../src/Editor.h \ - ../src/ElapsedPeriod.h \ - ../src/AutoComplete.h \ - ../src/ScintillaBase.h \ - PlatWin.h \ - HanjaDic.h \ - ScintillaWin.h AutoComplete.o: \ ../src/AutoComplete.cxx \ ../include/Platform.h \ @@ -125,6 +86,7 @@ Catalogue.o: \ ../include/Scintilla.h \ ../include/SciLexer.h \ ../lexlib/LexerModule.h \ + ../lexlib/CatalogueModules.h \ ../src/Catalogue.h CellBuffer.o: \ ../src/CellBuffer.cxx \ diff --git a/win32/makefile b/win32/makefile index 7aa1be716..30ae527fb 100644 --- a/win32/makefile +++ b/win32/makefile @@ -130,7 +130,7 @@ SCILEX_OBJS=\ HanjaDic.o \ PlatWin.o \ ScintillaBaseL.o \ - ScintillaWinL.o + ScintillaWin.o COMPONENT_OBJS = \ $(SRC_OBJS) \ @@ -162,9 +162,6 @@ include deps.mak ScintillaBaseL.o: $(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@ -ScintillaWinL.o: - $(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 f5610bb5b..c4fab693f 100644 --- a/win32/nmdeps.mak +++ b/win32/nmdeps.mak @@ -55,45 +55,6 @@ $(DIR_O)/ScintillaWin.obj: \ PlatWin.h \ HanjaDic.h \ ScintillaWin.h -$(DIR_O)/ScintillaWinL.obj: \ - ScintillaWin.cxx \ - ../include/Platform.h \ - ../include/ILoader.h \ - ../include/Sci_Position.h \ - ../include/ILexer.h \ - ../include/Scintilla.h \ - ../lexlib/CharacterCategory.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/CaseConvert.h \ - ../src/UniConversion.h \ - ../src/Selection.h \ - ../src/PositionCache.h \ - ../src/EditModel.h \ - ../src/MarginView.h \ - ../src/EditView.h \ - ../src/Editor.h \ - ../src/ElapsedPeriod.h \ - ../src/AutoComplete.h \ - ../src/ScintillaBase.h \ - PlatWin.h \ - HanjaDic.h \ - ScintillaWin.h $(DIR_O)/AutoComplete.obj: \ ../src/AutoComplete.cxx \ ../include/Platform.h \ @@ -125,6 +86,7 @@ $(DIR_O)/Catalogue.obj: \ ../include/Scintilla.h \ ../include/SciLexer.h \ ../lexlib/LexerModule.h \ + ../lexlib/CatalogueModules.h \ ../src/Catalogue.h $(DIR_O)/CellBuffer.obj: \ ../src/CellBuffer.cxx \ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index c5c9748a2..0e0f7558c 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -238,7 +238,7 @@ SCILEX_OBJS = \ $(DIR_O)\HanjaDic.obj \ $(DIR_O)\PlatWin.obj \ $(DIR_O)\ScintillaBaseL.obj \ - $(DIR_O)\ScintillaWinL.obj + $(DIR_O)\ScintillaWin.obj COMPONENT_OBJS = \ $(DIR_O)\HanjaDic.obj \ @@ -252,14 +252,6 @@ LEXCOMPONENT_OBJS = \ $(DIR_O)\ScintillaDLL.obj \ $(SCILEX_OBJS) -SOBJS = \ - $(SRC_OBJS) \ - $(DIR_O)\HanjaDic.obj \ - $(DIR_O)\PlatWin.obj \ - $(DIR_O)\ScintillaBase.obj \ - $(DIR_O)\ScintillaWin.obj \ - $(DIR_O)\ScintillaDLL.obj - $(DIR_O)\ScintRes.res : ScintRes.rc $(RC) -fo$@ $** @@ -287,9 +279,6 @@ $(LIBSCI): $(SCILEX_OBJS) $(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx $(CXX) $(CXXFLAGS) -DSCI_LEXER -c $(NAME)$@ ..\src\ScintillaBase.cxx -$(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx - $(CXX) $(CXXFLAGS) -DSCI_LEXER -c $(NAME)$@ ScintillaWin.cxx - # Dependencies !IF EXISTS(nmdeps.mak) |