diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-05-31 13:22:42 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-05-31 13:22:42 +1000 |
| commit | 95717fdd45e2c489027a1b6875c12f2006cd83c5 (patch) | |
| tree | 9b22a07def534b82a898b45b5e388a1d4f0ece42 | |
| parent | 79948de49ae85c62b48ca371a8784effcf774141 (diff) | |
| download | scintilla-mirror-95717fdd45e2c489027a1b6875c12f2006cd83c5.tar.gz | |
Don't repeat file names that are used for both Scintilla.DLL and SciLexer.DLL.
| -rw-r--r-- | win32/scintilla.mak | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/win32/scintilla.mak b/win32/scintilla.mak index f4421d3b1..ef2293779 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -57,7 +57,7 @@ clean: -del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(COMPONENT) $(LEXCOMPONENT) \ $(DIR_O)\*.res $(DIR_BIN)\*.map $(DIR_BIN)\*.exp $(DIR_BIN)\*.pdb $(DIR_BIN)\*.lib -SOBJS=\ +SHAREDOBJS=\ $(DIR_O)\AutoComplete.obj \ $(DIR_O)\CallTip.obj \ $(DIR_O)\CaseConvert.obj \ @@ -79,14 +79,17 @@ SOBJS=\ $(DIR_O)\PropSetSimple.obj \ $(DIR_O)\RESearch.obj \ $(DIR_O)\RunStyles.obj \ - $(DIR_O)\ScintillaBase.obj \ - $(DIR_O)\ScintillaWin.obj \ $(DIR_O)\Selection.obj \ $(DIR_O)\Style.obj \ $(DIR_O)\UniConversion.obj \ $(DIR_O)\ViewStyle.obj \ $(DIR_O)\XPM.obj +SOBJS=\ + $(SHAREDOBJS) \ + $(DIR_O)\ScintillaBase.obj \ + $(DIR_O)\ScintillaWin.obj + #++Autogenerated -- run scripts/LexGen.py to regenerate #**LEXOBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\) LEXOBJS=\ @@ -188,42 +191,17 @@ LEXOBJS=\ #--Autogenerated -- end of automatically generated section LOBJS=\ + $(SHAREDOBJS) \ $(DIR_O)\Accessor.obj \ - $(DIR_O)\AutoComplete.obj \ - $(DIR_O)\CallTip.obj \ - $(DIR_O)\CaseConvert.obj \ - $(DIR_O)\CaseFolder.obj \ $(DIR_O)\Catalogue.obj \ - $(DIR_O)\CellBuffer.obj \ - $(DIR_O)\CharacterCategory.obj \ - $(DIR_O)\CharacterSet.obj \ - $(DIR_O)\CharClassify.obj \ - $(DIR_O)\ContractionState.obj \ - $(DIR_O)\Decoration.obj \ - $(DIR_O)\Document.obj \ - $(DIR_O)\Editor.obj \ $(DIR_O)\ExternalLexer.obj \ - $(DIR_O)\Indicator.obj \ - $(DIR_O)\KeyMap.obj \ $(DIR_O)\LexerBase.obj \ $(DIR_O)\LexerModule.obj \ $(DIR_O)\LexerSimple.obj \ - $(DIR_O)\LineMarker.obj \ - $(DIR_O)\PerLine.obj \ - $(DIR_O)\PlatWin.obj \ - $(DIR_O)\PositionCache.obj \ - $(DIR_O)\PropSetSimple.obj \ - $(DIR_O)\RESearch.obj \ - $(DIR_O)\RunStyles.obj \ - $(DIR_O)\ScintillaBaseL.obj \ - $(DIR_O)\ScintillaWinL.obj \ - $(DIR_O)\Selection.obj \ - $(DIR_O)\Style.obj \ $(DIR_O)\StyleContext.obj \ - $(DIR_O)\UniConversion.obj \ - $(DIR_O)\ViewStyle.obj \ $(DIR_O)\WordList.obj \ - $(DIR_O)\XPM.obj \ + $(DIR_O)\ScintillaBaseL.obj \ + $(DIR_O)\ScintillaWinL.obj \ $(LEXOBJS) $(DIR_O)\ScintRes.res : ScintRes.rc |