diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/makefile | 10 | ||||
| -rw-r--r-- | win32/scintilla.mak | 9 | ||||
| -rw-r--r-- | win32/scintilla_vc6.mak | 2 |
3 files changed, 14 insertions, 7 deletions
diff --git a/win32/makefile b/win32/makefile index 986191e57..e6fa49f47 100644 --- a/win32/makefile +++ b/win32/makefile @@ -67,7 +67,7 @@ LexTADS3.o LexTAL.o LexTCL.o LexTeX.o LexVB.o LexVerilog.o LexVHDL.o LexYAML.o SOBJS = ScintillaWin.o ScintillaBase.o Editor.o CharClassify.o Decoration.o \ Document.o ContractionState.o CellBuffer.o CallTip.o \ ScintRes.o PlatWin.o PositionCache.o KeyMap.o Indicator.o LineMarker.o RESearch.o RunStyles.o \ - Style.o ViewStyle.o AutoComplete.o UniConversion.o PropSet.o XPM.o + Style.o ViewStyle.o AutoComplete.o UniConversion.o PropSet.o XPM.o PerLine.o $(COMPONENT): $(SOBJS) Scintilla.def $(DLLWRAP) --add-stdcall-alias --target i386-mingw32 -o $@ $(SOBJS) $(LDFLAGS) -s --relocatable @@ -75,7 +75,7 @@ LOBJS = ScintillaWinL.o ScintillaBaseL.o Editor.o CharClassify.o Decoration.o \ Document.o ContractionState.o CellBuffer.o CallTip.o \ ScintRes.o PlatWin.o PositionCache.o KeyMap.o Indicator.o LineMarker.o RESearch.o RunStyles.o \ Style.o ViewStyle.o AutoComplete.o UniConversion.o KeyWords.o \ - DocumentAccessor.o PropSet.o ExternalLexer.o StyleContext.o XPM.o $(LEXOBJS) + DocumentAccessor.o PropSet.o ExternalLexer.o StyleContext.o XPM.o PerLine.o $(LEXOBJS) $(LEXCOMPONENT): $(LOBJS) Scintilla.def $(DLLWRAP) --add-stdcall-alias --target i386-mingw32 -o $@ $(LOBJS) $(LDFLAGS) -s --relocatable @@ -91,16 +91,16 @@ ScintillaBaseL.o: ScintillaBase.cxx Platform.h Scintilla.h SciLexer.h \ ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \ LineMarker.h Style.h AutoComplete.h ViewStyle.h Document.h Editor.h \ ScintillaBase.h PropSet.h SString.h Accessor.h DocumentAccessor.h \ - KeyWords.h ExternalLexer.h + KeyWords.h ExternalLexer.h PerLine.h ScintillaWinL.o: ScintillaWin.cxx Platform.h Scintilla.h SciLexer.h \ ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \ LineMarker.h Style.h AutoComplete.h ViewStyle.h Document.h Editor.h \ ScintillaBase.h PropSet.h SString.h Accessor.h KeyWords.h \ - ExternalLexer.h UniConversion.h + ExternalLexer.h UniConversion.h PerLine.h ScintillaWinS.o: ScintillaWin.cxx Platform.h Scintilla.h \ ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \ LineMarker.h Style.h AutoComplete.h ViewStyle.h Document.h Editor.h \ - ScintillaBase.h UniConversion.h + ScintillaBase.h UniConversion.h PerLine.h ScintillaBaseL.o: $(CC) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index d7ff22dd8..f2f64a87f 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -108,7 +108,8 @@ SOBJS=\ $(DIR_O)\Style.obj \ $(DIR_O)\UniConversion.obj \ $(DIR_O)\ViewStyle.obj \ - $(DIR_O)\XPM.obj + $(DIR_O)\XPM.obj \ + $(DIR_O)\PerLine.obj #++Autogenerated -- run src/LexGen.py to regenerate #**LEXOBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\) @@ -220,6 +221,7 @@ LOBJS=\ $(DIR_O)\UniConversion.obj \ $(DIR_O)\ViewStyle.obj \ $(DIR_O)\XPM.obj \ + $(DIR_O)\PerLine.obj \ $(LEXOBJS) $(DIR_O)\ScintRes.res : ScintRes.rc @@ -285,7 +287,7 @@ $(DIR_O)\Document.obj: ../src/Document.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \ ../src/Partitioning.h ../src/RunStyles.h ../src/CellBuffer.h \ ../src/CharClassify.h ../src/Decoration.h ../src/Document.h \ - ../src/RESearch.h + ../src/RESearch.h ../src/PerLine.h $(DIR_O)\DocumentAccessor.obj: ../src/DocumentAccessor.cxx ../include/Platform.h \ ../include/PropSet.h ../include/SString.h ../src/SVector.h \ ../include/Accessor.h ../src/DocumentAccessor.h ../src/SplitVector.h \ @@ -472,6 +474,9 @@ $(DIR_O)\LexYAML.obj: ..\src\LexYAML.cxx $(LEX_HEADERS) $(DIR_O)\LineMarker.obj: ../src/LineMarker.cxx ../include/Platform.h \ ../include/Scintilla.h ../src/XPM.h ../src/LineMarker.h +$(DIR_O)\PerLine.obj: ../src/PerLine.cxx ../include/Platform.h \ + ../include/Scintilla.h ../src/SVector.h ../src/SplitVector.h \ + ../src/Partitioning.h ../src/RunStyles.h ../src/PerLine.h $(DIR_O)\PlatWin.obj: PlatWin.cxx ../include/Platform.h PlatformRes.h \ ../src/UniConversion.h ../src/XPM.h $(DIR_O)\PositionCache.obj: ../src/Editor.cxx ../include/Platform.h ../include/Scintilla.h \ diff --git a/win32/scintilla_vc6.mak b/win32/scintilla_vc6.mak index 1f24df3c8..3d9191755 100644 --- a/win32/scintilla_vc6.mak +++ b/win32/scintilla_vc6.mak @@ -100,6 +100,7 @@ SOBJS=\ $(DIR_O)\Indicator.obj \ $(DIR_O)\KeyMap.obj \ $(DIR_O)\LineMarker.obj \ + $(DIR_O)\PerLine.obj \ $(DIR_O)\PlatWin.obj \ $(DIR_O)\PositionCache.obj \ $(DIR_O)\PropSet.obj \ @@ -210,6 +211,7 @@ LOBJS=\ $(DIR_O)\KeyMap.obj \ $(DIR_O)\KeyWords.obj \ $(DIR_O)\LineMarker.obj \ + $(DIR_O)\PerLine.obj \ $(DIR_O)\PlatWin.obj \ $(DIR_O)\PositionCache.obj \ $(DIR_O)\RunStyles.obj \ |