diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/makefile | 10 | ||||
| -rw-r--r-- | win32/scintilla.mak | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/win32/makefile b/win32/makefile index 66691288a..3c04dadd1 100644 --- a/win32/makefile +++ b/win32/makefile @@ -39,14 +39,14 @@ LEXOBJS = LexAVE.o LexConf.o LexCPP.o LexHTML.o LexLua.o LexOthers.o \ SOBJS = ScintillaWin.o ScintillaBase.o Editor.o Document.o \ ContractionState.o CellBuffer.o CallTip.o \ - ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o PosRegExp.o \ + ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o RESearch.o \ Style.o ViewStyle.o AutoComplete.o UniConversion.o $(COMPONENT): $(SOBJS) $(DLLWRAP) --target i386-mingw32 -o $@ $(SOBJS) $(LDFLAGS) -s --relocatable LOBJS = ScintillaWinL.o ScintillaBaseL.o Editor.o Document.o \ ContractionState.o CellBuffer.o CallTip.o \ - ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o PosRegExp.o \ + ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o RESearch.o \ Style.o ViewStyle.o AutoComplete.o UniConversion.o KeyWords.o \ DocumentAccessor.o PropSet.o $(LEXOBJS) $(LEXCOMPONENT): $(LOBJS) @@ -56,7 +56,7 @@ AutoComplete.o: AutoComplete.cxx Platform.h AutoComplete.h CallTip.o: CallTip.cxx Platform.h CallTip.h CellBuffer.o: CellBuffer.cxx Platform.h Scintilla.h CellBuffer.h ContractionState.o: ContractionState.cxx Platform.h ContractionState.h -Document.o: Document.cxx Platform.h Scintilla.h PosRegExp.h CellBuffer.h \ +Document.o: Document.cxx Platform.h Scintilla.h RESearch.h CellBuffer.h \ Document.h DocumentAccessor.o: DocumentAccessor.cxx Platform.h PropSet.h \ SString.h Accessor.h DocumentAccessor.h Scintilla.h @@ -91,10 +91,8 @@ KeyWords.o: KeyWords.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ Scintilla.h SciLexer.h LineMarker.o: LineMarker.cxx Platform.h Scintilla.h LineMarker.h PlatWin.o: PlatWin.cxx Platform.h PlatformRes.h UniConversion.h -# PosRegExp.cxx is an external library so is not purged of warnings so turn the warnings off with -w. -PosRegExp.o: PosRegExp.cxx PosRegExp.h - $(CC) $(CXXFLAGS) -w -c $< -o $@ PropSet.o: PropSet.cxx Platform.h PropSet.h SString.h +RESearch.o: RESearch.cxx RESearch.h ScintillaBase.o: ScintillaBase.cxx Platform.h Scintilla.h \ ContractionState.h CellBuffer.h CallTip.h KeyMap.h Indicator.h \ LineMarker.h Style.h ViewStyle.h AutoComplete.h Document.h Editor.h \ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 3e3dbcf1a..eb7b64a01 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -95,7 +95,7 @@ SOBJS=\ $(DIR_O)\KeyMap.obj \ $(DIR_O)\LineMarker.obj \ $(DIR_O)\PlatWin.obj \ - $(DIR_O)\PosRegExp.obj \ + $(DIR_O)\RESearch.obj \ $(DIR_O)\ScintillaBase.obj \ $(DIR_O)\ScintillaWin.obj \ $(DIR_O)\Style.obj \ @@ -128,7 +128,7 @@ LOBJS=\ $(DIR_O)\KeyWords.obj \ $(DIR_O)\LineMarker.obj \ $(DIR_O)\PlatWin.obj \ - $(DIR_O)\PosRegExp.obj \ + $(DIR_O)\RESearch.obj \ $(DIR_O)\PropSet.obj \ $(DIR_O)\ScintillaBaseL.obj \ $(DIR_O)\ScintillaWinL.obj \ @@ -189,7 +189,7 @@ $(DIR_O)\CellBuffer.obj: ..\src\CellBuffer.cxx ..\include\Platform.h ..\include\ $(DIR_O)\ContractionState.obj: ..\src\ContractionState.cxx ..\include\Platform.h ..\src\ContractionState.h $(DIR_O)\Document.obj: ..\src\Document.cxx ..\include\Platform.h ..\include\Scintilla.h \ - ..\include\PosRegExp.h ..\src\CellBuffer.h ..\src\Document.h + ..\src\RESearch.h ..\src\CellBuffer.h ..\src\Document.h $(DIR_O)\DocumentAccessor.obj: ..\src\DocumentAccessor.cxx ..\include\Platform.h ..\include\PropSet.h \ ..\include\SString.h ..\include\Accessor.h ..\src\DocumentAccessor.h ..\include\Scintilla.h @@ -254,7 +254,7 @@ $(DIR_O)\LineMarker.obj: ..\src\LineMarker.cxx ..\include\Platform.h ..\include\ $(DIR_O)\PlatWin.obj: PlatWin.cxx ..\include\Platform.h PlatformRes.h ..\src\UniConversion.h -$(DIR_O)\PosRegExp.obj: ..\src\PosRegExp.cxx ..\include\PosRegExp.h +$(DIR_O)\RESearch.obj: ..\src\RESearch.cxx ..\src\RESearch.h $(DIR_O)\PropSet.obj: ..\src\PropSet.cxx ..\include\Platform.h ..\include\PropSet.h \ ..\include\SString.h |