diff options
Diffstat (limited to 'win32/scintilla.mak')
| -rw-r--r-- | win32/scintilla.mak | 49 |
1 files changed, 6 insertions, 43 deletions
diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 91b727d4c..15de55698 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -106,7 +106,8 @@ BASEOBJS=\ SOBJS=\ $(BASEOBJS) \ $(DIR_O)\ScintillaBase.obj \ - $(DIR_O)\ScintillaWin.obj + $(DIR_O)\ScintillaWin.obj \ + $(DIR_O)\ScintillaDLL.obj #++Autogenerated -- run scripts/LexGen.py to regenerate #**LEXOBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\) @@ -245,10 +246,10 @@ $(DIR_O)\ScintRes.res : ScintRes.rc $(COMPONENT): $(SOBJS) $(DIR_O)\ScintRes.res $(LD) $(LDFLAGS) -DEF:Scintilla.def -DLL -OUT:$@ $** $(LIBS) -$(LEXCOMPONENT): $(SCILEXOBJS) $(DIR_O)\ScintillaWinL.obj $(DIR_O)\ScintRes.res +$(LEXCOMPONENT): $(SCILEXOBJS) $(DIR_O)\ScintillaDLL.obj $(DIR_O)\ScintillaWinL.obj $(DIR_O)\ScintRes.res $(LD) $(LDFLAGS) -DEF:Scintilla.def -DLL -OUT:$@ $** $(LIBS) -$(LIBSCI): $(SCILEXOBJS) $(DIR_O)\ScintillaWinS.obj +$(LIBSCI): $(SCILEXOBJS) $(DIR_O)\ScintillaWin.obj LIB /OUT:$@ $** # Define how to build all the objects and what they depend on @@ -269,9 +270,6 @@ $(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx $(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx $(CXX) $(CXXFLAGS) -DSCI_LEXER -c $(NAME)$@ ScintillaWin.cxx -$(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx - $(CXX) $(CXXFLAGS) -DSTATIC_BUILD -c $(NAME)$@ ScintillaWin.cxx - # Dependencies # All lexers depend on this set of headers @@ -965,6 +963,8 @@ $(DIR_O)\ScintillaBaseL.obj: \ ../src/Editor.h \ ../src/AutoComplete.h \ ../src/ScintillaBase.h +$(DIR_O)\ScintillaDLL.obj: \ + ScintillaDLL.cxx $(DIR_O)\ScintillaWin.obj: \ ScintillaWin.cxx \ ../include/Platform.h \ @@ -1039,43 +1039,6 @@ $(DIR_O)\ScintillaWinL.obj: \ ../src/ScintillaBase.h \ PlatWin.h \ HanjaDic.h -$(DIR_O)\ScintillaWinS.obj: \ - ScintillaWin.cxx \ - ../include/Platform.h \ - ../include/ILoader.h \ - ../include/Sci_Position.h \ - ../include/ILexer.h \ - ../include/Scintilla.h \ - ../lexlib/StringCopy.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/AutoComplete.h \ - ../src/ScintillaBase.h \ - PlatWin.h \ - HanjaDic.h $(DIR_O)\Selection.obj: \ ../src/Selection.cxx \ ../include/Platform.h \ |