diff options
| author | nyamatongwe <devnull@localhost> | 2010-07-15 16:15:58 +1000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2010-07-15 16:15:58 +1000 |
| commit | d54998c6b37798b5dd10b313f1d67b5e0baab0e9 (patch) | |
| tree | de45ec195d4d14805cda60b8a2ae30d42c40608d | |
| parent | e69d6d2c697fc7ca770a19c9514f9877a6112ded (diff) | |
| download | scintilla-mirror-d54998c6b37798b5dd10b313f1d67b5e0baab0e9.tar.gz | |
Updated for lexer objects with files in lexlib and lexers as well as src.
| -rw-r--r-- | macosx/makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/macosx/makefile b/macosx/makefile index d5cb12f7e..c7ae89626 100644 --- a/macosx/makefile +++ b/macosx/makefile @@ -18,10 +18,10 @@ GCC_MAJOR := $(shell $(CC) -v 2>&1 | \ STATICLIB=../bin/libscintilla.a DYNAMICLIB=../bin/libscintilla.dylib -vpath %.h ../src ../include -vpath %.cxx ../src +vpath %.h ../src ../include ../lexlib +vpath %.cxx ../src ../lexlib ../lexers -INCLUDEDIRS=-I ../include -I ../src +INCLUDEDIRS=-I ../include -I ../src -I ../lexlib ifeq ($(GCC_MAJOR),3) # 10.4 will have GCC 4 or better, so this should only ever happen @@ -60,7 +60,7 @@ endif .c.o: $(CCOMP) $(CXXFLAGS) $(OPTIONS) $(DFLAGS) $(CONTAINER) $(ARCHFLAGS) $(EXT_INPUT) $(INCLUDEDIRS) -w -c $< -LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../src/Lex*.cxx)))) +LEXOBJS:=$(addsuffix .o,$(basename $(notdir $(wildcard ../lexers/Lex*.cxx)))) # The LEXOBJS have to be treated specially as the functions in them are not called from external code @@ -72,12 +72,12 @@ clean: rm -f *.o $(COMPLIB) deps: - $(CC) -MM -DSCI_NAMESPACE -DMACOSX -DSCI_LEXER $(CXXFLAGS) $(INCLUDEDIRS) *.cxx ../src/*.cxx >deps.mak + $(CC) -MM -DSCI_NAMESPACE -DMACOSX -DSCI_LEXER $(CXXFLAGS) $(INCLUDEDIRS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../src/*.cxx >deps.mak -COMPLIB=DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o \ - CharClassify.o Decoration.o Document.o PerLine.o CallTip.o PositionCache.o \ - ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSet.o PlatMacOSX.o \ - KeyMap.o LineMarker.o ScintillaMacOSX.o CellBuffer.o ViewStyle.o \ +COMPLIB=Accessor.o CharacterSet.o LexerBase.o LexerModule.o LexerSimple.o StyleContext.o WordList.o \ + CharClassify.o Decoration.o Document.o PerLine.o Catalogue.o CallTip.o \ + ScintillaBase.o ContractionState.o Editor.o ExternalLexer.o PropSetSimple.o PlatMacOSX.o \ + KeyMap.o LineMarker.o PositionCache.o ScintillaMacOSX.o CellBuffer.o ViewStyle.o \ RESearch.o RunStyles.o Selection.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o \ TCarbonEvent.o TView.o ScintillaCallTip.o $(EXTOBS) \ $(LEXOBJS) |