diff options
Diffstat (limited to 'win32/scintilla.mak')
| -rw-r--r-- | win32/scintilla.mak | 61 |
1 files changed, 38 insertions, 23 deletions
diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 1537fb190..c5c9748a2 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -54,8 +54,8 @@ LDFLAGS=$(LDDEBUG) $(LDFLAGS) CXXFLAGS=$(CXXFLAGS) $(CXXNDEBUG) !ENDIF -INCLUDEDIRS=-I../include -I../src -I../lexlib -CXXFLAGS=$(CXXFLAGS) $(INCLUDEDIRS) +INCLUDES=-I../include -I../src -I../lexlib +CXXFLAGS=$(CXXFLAGS) $(INCLUDES) all: $(COMPONENT) $(LEXCOMPONENT) $(LIBSCI) @@ -67,7 +67,7 @@ depend: python DepGen.py # Required for base Scintilla -BASEOBJS=\ +SRC_OBJS=\ $(DIR_O)\AutoComplete.obj \ $(DIR_O)\CallTip.obj \ $(DIR_O)\CaseConvert.obj \ @@ -88,7 +88,6 @@ BASEOBJS=\ $(DIR_O)\LineMarker.obj \ $(DIR_O)\MarginView.obj \ $(DIR_O)\PerLine.obj \ - $(DIR_O)\PlatWin.obj \ $(DIR_O)\PositionCache.obj \ $(DIR_O)\PropSetSimple.obj \ $(DIR_O)\RESearch.obj \ @@ -98,18 +97,11 @@ BASEOBJS=\ $(DIR_O)\UniConversion.obj \ $(DIR_O)\UniqueString.obj \ $(DIR_O)\ViewStyle.obj \ - $(DIR_O)\XPM.obj \ - $(DIR_O)\HanjaDic.obj \ - -SOBJS=\ - $(BASEOBJS) \ - $(DIR_O)\ScintillaBase.obj \ - $(DIR_O)\ScintillaWin.obj \ - $(DIR_O)\ScintillaDLL.obj + $(DIR_O)\XPM.obj #++Autogenerated -- run scripts/LexGen.py to regenerate -#**LEXOBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\) -LEXOBJS=\ +#**LEX_OBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\) +LEX_OBJS=\ $(DIR_O)\LexA68k.obj \ $(DIR_O)\LexAbaqus.obj \ $(DIR_O)\LexAda.obj \ @@ -227,7 +219,7 @@ LEXOBJS=\ #--Autogenerated -- end of automatically generated section # Required by lexers -LEXLIBOBJS=\ +LEXLIB_OBJS = \ $(DIR_O)\Accessor.obj \ $(DIR_O)\Catalogue.obj \ $(DIR_O)\ExternalLexer.obj \ @@ -239,22 +231,45 @@ LEXLIBOBJS=\ $(DIR_O)\WordList.obj \ # Required by libraries and DLLs that include lexing -SCILEXOBJS=\ - $(BASEOBJS) \ - $(LEXLIBOBJS) \ - $(LEXOBJS) \ - $(DIR_O)\ScintillaBaseL.obj +SCILEX_OBJS = \ + $(SRC_OBJS) \ + $(LEXLIB_OBJS) \ + $(LEX_OBJS) \ + $(DIR_O)\HanjaDic.obj \ + $(DIR_O)\PlatWin.obj \ + $(DIR_O)\ScintillaBaseL.obj \ + $(DIR_O)\ScintillaWinL.obj + +COMPONENT_OBJS = \ + $(DIR_O)\HanjaDic.obj \ + $(DIR_O)\PlatWin.obj \ + $(DIR_O)\ScintillaBase.obj \ + $(DIR_O)\ScintillaDLL.obj \ + $(DIR_O)\ScintillaWin.obj \ + $(SRC_OBJS) + +LEXCOMPONENT_OBJS = \ + $(DIR_O)\ScintillaDLL.obj \ + $(SCILEX_OBJS) + +SOBJS = \ + $(SRC_OBJS) \ + $(DIR_O)\HanjaDic.obj \ + $(DIR_O)\PlatWin.obj \ + $(DIR_O)\ScintillaBase.obj \ + $(DIR_O)\ScintillaWin.obj \ + $(DIR_O)\ScintillaDLL.obj $(DIR_O)\ScintRes.res : ScintRes.rc $(RC) -fo$@ $** -$(COMPONENT): $(SOBJS) $(DIR_O)\ScintRes.res +$(COMPONENT): $(COMPONENT_OBJS) $(DIR_O)\ScintRes.res $(LD) $(LDFLAGS) -DEF:Scintilla.def -DLL -OUT:$@ $** $(LIBS) -$(LEXCOMPONENT): $(SCILEXOBJS) $(DIR_O)\ScintillaDLL.obj $(DIR_O)\ScintillaWinL.obj $(DIR_O)\ScintRes.res +$(LEXCOMPONENT): $(LEXCOMPONENT_OBJS) $(DIR_O)\ScintRes.res $(LD) $(LDFLAGS) -DEF:Scintilla.def -DLL -OUT:$@ $** $(LIBS) -$(LIBSCI): $(SCILEXOBJS) $(DIR_O)\ScintillaWin.obj +$(LIBSCI): $(SCILEX_OBJS) LIB /OUT:$@ $** # Define how to build all the objects and what they depend on |