diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-04-04 16:21:09 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-04-04 16:21:09 +1000 |
| commit | 1cd26e8ee9577099631a72836197afd101aaaff5 (patch) | |
| tree | 351f1315f4577970747aa37d273c2f7fd84d1883 /win32/makefile | |
| parent | 27a277fe4bfeff302b3ad4752e59311ef6426193 (diff) | |
| download | scintilla-mirror-1cd26e8ee9577099631a72836197afd101aaaff5.tar.gz | |
Backport: Move DLL entry points DllMain and Scintilla_DirectFunction into ScintillaDLL.cxx
to simplify build process by eliminating the compilation of ScintillaWin.cxx
into ScintillaWinS.o|obj.
Backport of changeset 6670:cfe90078d684.
Diffstat (limited to 'win32/makefile')
| -rw-r--r-- | win32/makefile | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/win32/makefile b/win32/makefile index 0ec1f94f1..1d5d4d6c2 100644 --- a/win32/makefile +++ b/win32/makefile @@ -126,7 +126,7 @@ BASEOBJS = \ XPM.o \ HanjaDic.o -SOBJS = ScintillaWin.o ScintillaBase.o $(BASEOBJS) +SOBJS = ScintillaDLL.o ScintillaWin.o ScintillaBase.o $(BASEOBJS) # Required by lexers LEXLIBOBJS=\ @@ -151,10 +151,10 @@ SCILEXOBJS=\ $(COMPONENT): $(SOBJS) Scintilla.def $(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) $(SOBJS) $(CXXFLAGS) $(LIBS) -$(LEXCOMPONENT): ScintillaWinL.o $(SCILEXOBJS) Scintilla.def - $(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) ScintillaWinL.o $(SCILEXOBJS) $(CXXFLAGS) $(LIBS) +$(LEXCOMPONENT): ScintillaDLL.o ScintillaWinL.o $(SCILEXOBJS) Scintilla.def + $(CXX) $(LDFLAGS) -o $@ $(STRIPFLAG) ScintillaDLL.o ScintillaWinL.o $(SCILEXOBJS) $(CXXFLAGS) $(LIBS) -$(LIBSCI): ScintillaWinS.o $(SCILEXOBJS) +$(LIBSCI): ScintillaWin.o $(SCILEXOBJS) $(AR) rc $@ $^ $(RANLIB) $@ @@ -186,22 +186,9 @@ ScintillaWinL.o: ScintillaWin.cxx Platform.h \ LexerModule.h Catalogue.h CaseConvert.h \ CaseFolder.h -ScintillaWinS.o: ScintillaWin.cxx Platform.h \ - ILexer.h Scintilla.h SplitVector.h \ - Partitioning.h RunStyles.h ContractionState.h \ - CellBuffer.h CallTip.h KeyMap.h Indicator.h \ - XPM.h LineMarker.h Style.h AutoComplete.h \ - ViewStyle.h CharClassify.h Decoration.h \ - Document.h Selection.h PositionCache.h \ - EditModel.h Editor.h EditView.h ScintillaBase.h UniConversion.h \ - CaseConvert.h CaseFolder.h - ScintillaBaseL.o: $(CXX) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@ -ScintillaWinS.o: - $(CXX) $(CXXFLAGS) -D STATIC_BUILD -c $< -o $@ - ScintillaWinL.o: $(CXX) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@ |