diff options
Diffstat (limited to 'win32/scintilla.mak')
| -rw-r--r-- | win32/scintilla.mak | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/win32/scintilla.mak b/win32/scintilla.mak index cf272173b..ed40818ef 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -62,7 +62,7 @@ LDFLAGS=$(LDDEBUG) $(LDFLAGS) CXXFLAGS=$(CXXFLAGS) $(CXXNDEBUG) !ENDIF -INCLUDES=-I../include -I../src -I../lexlib +INCLUDES=-I../include -I../src CXXFLAGS=$(CXXFLAGS) $(INCLUDES) all: $(COMPONENT) $(LIBSCI) @@ -70,7 +70,7 @@ all: $(COMPONENT) $(LIBSCI) clean: -del /q $(DIR_O)\*.obj $(DIR_O)\*.pdb $(DIR_O)\*.asm $(COMPONENT) \ $(DIR_O)\*.res $(DIR_BIN)\*.map $(DIR_BIN)\*.exp $(DIR_BIN)\*.pdb \ - $(DIR_BIN)\Scintilla.lib $(DIR_BIN)\SciLexer.lib $(LIBSCI) + $(DIR_BIN)\Scintilla.lib $(LIBSCI) depend: pyw DepGen.py @@ -108,28 +108,6 @@ SRC_OBJS=\ $(DIR_O)\ViewStyle.obj \ $(DIR_O)\XPM.obj -# Required by lexers -LEXLIB_OBJS = \ - $(DIR_O)\Accessor.obj \ - $(DIR_O)\CatalogueL.obj \ - $(DIR_O)\ExternalLexer.obj \ - $(DIR_O)\DefaultLexer.obj \ - $(DIR_O)\LexerBase.obj \ - $(DIR_O)\LexerModule.obj \ - $(DIR_O)\LexerSimple.obj \ - $(DIR_O)\StyleContext.obj \ - $(DIR_O)\WordList.obj - -# Required by libraries and DLLs that include lexing -SCILEX_OBJS = \ - $(SRC_OBJS) \ - $(LEXLIB_OBJS) \ - $(LEX_OBJS) \ - $(DIR_O)\HanjaDic.obj \ - $(DIR_O)\PlatWin.obj \ - $(DIR_O)\ScintillaBaseL.obj \ - $(DIR_O)\ScintillaWin.obj - COMPONENT_OBJS = \ $(DIR_O)\HanjaDic.obj \ $(DIR_O)\PlatWin.obj \ @@ -151,23 +129,9 @@ $(LIBSCI): $(COMPONENT_OBJS) {..\src}.cxx{$(DIR_O)}.obj:: $(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $< -{..\lexlib}.cxx{$(DIR_O)}.obj:: - $(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $< -{..\lexers}.cxx{$(DIR_O)}.obj:: - $(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $< {.}.cxx{$(DIR_O)}.obj:: $(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $< -# Some source files are compiled into more than one object because of different conditional compilation -$(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx - $(CXX) $(CXXFLAGS) -DSCI_LEXER -c $(NAME)$@ ..\src\ScintillaBase.cxx - -$(DIR_O)\CatalogueL.obj: ..\src\Catalogue.cxx - $(CXX) $(CXXFLAGS) -DSCI_LEXER -c $(NAME)$@ ..\src\Catalogue.cxx - -$(DIR_O)\Catalogue.obj: ..\src\Catalogue.cxx - $(CXX) $(CXXFLAGS) -DSCI_LEXER -DSCI_EMPTYCATALOGUE -c $(NAME)$@ ..\src\Catalogue.cxx - # Dependencies !IF EXISTS(nmdeps.mak) |