diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/makefile | 40 | ||||
| -rw-r--r-- | win32/scintilla.mak | 35 |
2 files changed, 41 insertions, 34 deletions
diff --git a/win32/makefile b/win32/makefile index 368d8ea5f..8874825cd 100644 --- a/win32/makefile +++ b/win32/makefile @@ -18,7 +18,7 @@ LDFLAGS = -lkernel32 -luser32 -lgdi32 -limm32 -lole32 -luuid # Add -MMD to get dependencies #CXXFLAGS = -g -pg -pedantic -Os -fno-exceptions -fvtable-thunks -fno-rtti INCLUDEDIRS=-I ../include -I ../src -CXXBASEFLAGS = -W -Wall -pedantic $(INCLUDEDIRS) -Os -fno-exceptions -fvtable-thunks -fno-rtti +CXXBASEFLAGS = -W -Wall -pedantic $(INCLUDEDIRS) -Os -fno-exceptions -fvtable-thunks -fno-rtti ifdef DEBUG CXXFLAGS=-DDEBUG $(CXXBASEFLAGS) @@ -34,8 +34,8 @@ ALL: $(COMPONENT) $(LEXCOMPONENT) ScintillaWinS.o WindowAccessor.o clean: del /q *.exe *.o *.obj *.dll *.res *.map -LEXOBJS = LexConf.o LexCPP.o LexHTML.o LexLua.o LexOthers.o LexPascal.o \ - LexPerl.o LexPython.o LexSQL.o LexVB.o +LEXOBJS = LexAVE.o LexConf.o LexCPP.o LexHTML.o LexLua.o LexOthers.o \ + LexPascal.o LexPerl.o LexPython.o LexSQL.o LexVB.o SOBJS = ScintillaWin.o ScintillaBase.o Editor.o Document.o \ ContractionState.o CellBuffer.o CallTip.o \ @@ -43,14 +43,14 @@ SOBJS = ScintillaWin.o ScintillaBase.o Editor.o Document.o \ ViewStyle.o AutoComplete.o UniConversion.o $(COMPONENT): $(SOBJS) $(DLLWRAP) --target i386-mingw32 -o $@ $(SOBJS) $(LDFLAGS) -s --relocatable - + LOBJS = ScintillaWinL.o ScintillaBaseL.o Editor.o Document.o \ ContractionState.o CellBuffer.o CallTip.o \ ScintRes.o PlatWin.o KeyMap.o Indicator.o LineMarker.o Style.o ViewStyle.o \ AutoComplete.o UniConversion.o KeyWords.o DocumentAccessor.o PropSet.o $(LEXOBJS) $(LEXCOMPONENT): $(LOBJS) $(DLLWRAP) --target i386-mingw32 -o $@ $(LOBJS) $(LDFLAGS) -s --relocatable - + AutoComplete.o: AutoComplete.cxx Platform.h AutoComplete.h CallTip.o: CallTip.cxx Platform.h CallTip.h CellBuffer.o: CellBuffer.cxx Platform.h Scintilla.h CellBuffer.h @@ -64,28 +64,30 @@ Editor.o: Editor.cxx Platform.h Scintilla.h ContractionState.h \ Document.h Editor.h Indicator.o: Indicator.cxx Platform.h Scintilla.h Indicator.h KeyMap.o: KeyMap.cxx Platform.h Scintilla.h KeyMap.h +LexAVE.o: LexAVE.cxx Platform.h PropSet.h \ + SString.h Accessor.h KeyWords.h Scintilla.h SciLexer.h LexConf.o: LexConf.cxx Platform.h PropSet.h \ - SString.h Accessor.h KeyWords.h Scintilla.h SciLexer.h + SString.h Accessor.h KeyWords.h Scintilla.h SciLexer.h LexCPP.o: LexCPP.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h + Scintilla.h SciLexer.h LexHTML.o: LexHTML.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h + Scintilla.h SciLexer.h LexLua.o: LexLua.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h + Scintilla.h SciLexer.h LexOthers.o: LexOthers.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h + Scintilla.h SciLexer.h LexPascal.o: LexPascal.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h + Scintilla.h SciLexer.h LexPerl.o: LexPerl.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h + Scintilla.h SciLexer.h LexPython.o: LexPython.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h + Scintilla.h SciLexer.h LexSQL.o: LexSQL.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h + Scintilla.h SciLexer.h LexVB.o: LexVB.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h + Scintilla.h SciLexer.h KeyWords.o: KeyWords.cxx Platform.h PropSet.h SString.h Accessor.h KeyWords.h \ - Scintilla.h SciLexer.h + Scintilla.h SciLexer.h LineMarker.o: LineMarker.cxx Platform.h Scintilla.h LineMarker.h PlatWin.o: PlatWin.cxx Platform.h PlatformRes.h UniConversion.h PropSet.o: PropSet.cxx Platform.h PropSet.h SString.h @@ -117,13 +119,13 @@ WindowAccessor.o: DocumentAccessor.cxx Platform.h PropSet.h SString.h Accessor.h ScintillaBaseL.o: $(CC) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@ - + ScintillaWinS.o: $(CC) $(CXXFLAGS) -D STATIC_BUILD -c $< -o $@ - + ScintillaWinL.o: $(CC) $(CXXFLAGS) -D SCI_LEXER -c $< -o $@ - + ScintRes.o: ScintRes.rc PlatformRes.h windres ScintRes.rc $@ diff --git a/win32/scintilla.mak b/win32/scintilla.mak index 72a21793d..fdf3c3865 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -1,7 +1,7 @@ # Make file for Scintilla on Windows Visual C++ and Borland C++ version # Copyright 1998-2001 by Neil Hodgson <neilh@scintilla.org> # The License.txt file describes the conditions under which this software may be distributed. -# This makefile is for using Visual C++ with nmake or Borland C++ with make depending on +# This makefile is for using Visual C++ with nmake or Borland C++ with make depending on # the setting of the VENDOR macro. If no VENDOR is defined n the command line then # the tool used is automatically detected. # Usage for Microsoft: @@ -36,7 +36,7 @@ RC=rc LD=link INCLUDEDIRS=-I ../include -I ../src -CXXFLAGS=/TP /W4 +CXXFLAGS=/TP /W4 # For something scary:/Wp64 CXXDEBUG=/Zi /Od /MDd -DDEBUG CXXNDEBUG=/Ox /MD -DNDEBUG @@ -47,7 +47,7 @@ LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.LIB !IFDEF QUIET CC=@$(CC) -CXXDEBUG=$(CXXDEBUG) /nologo +CXXDEBUG=$(CXXDEBUG) /nologo CXXNDEBUG=$(CXXNDEBUG) /nologo LDFLAGS=$(LDFLAGS) /nologo !ENDIF @@ -102,6 +102,7 @@ SOBJS=\ $(DIR_O)\ViewStyle.obj LEXOBJS=\ + $(DIR_O)\LexAVE.obj \ $(DIR_O)\LexConf.obj \ $(DIR_O)\LexCPP.obj \ $(DIR_O)\LexHTML.obj \ @@ -201,47 +202,51 @@ $(DIR_O)\KeyMap.obj: ..\src\KeyMap.cxx ..\include\Platform.h ..\include\Scintill $(DIR_O)\KeyWords.obj: ..\src\KeyWords.cxx ..\include\Platform.h ..\include\PropSet.h \ ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h + ..\include\Scintilla.h ..\include\SciLexer.h -$(DIR_O)\LexCPP.obj: ..\src\LexCPP.cxx ..\include\Platform.h ..\include\PropSet.h \ +$(DIR_O)\LexAVE.obj: ..\src\LexAVE.cxx ..\include\Platform.h ..\include\PropSet.h \ ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h + ..\include\Scintilla.h ..\include\SciLexer.h $(DIR_O)\LexConf.obj: ..\src\LexConf.cxx ..\include\Platform.h ..\include\PropSet.h \ ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h + ..\include\Scintilla.h ..\include\SciLexer.h + +$(DIR_O)\LexCPP.obj: ..\src\LexCPP.cxx ..\include\Platform.h ..\include\PropSet.h \ + ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ + ..\include\Scintilla.h ..\include\SciLexer.h $(DIR_O)\LexHTML.obj: ..\src\LexHTML.cxx ..\include\Platform.h ..\include\PropSet.h \ ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h + ..\include\Scintilla.h ..\include\SciLexer.h $(DIR_O)\LexLua.obj: ..\src\LexLua.cxx ..\include\Platform.h ..\include\PropSet.h \ ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h + ..\include\Scintilla.h ..\include\SciLexer.h $(DIR_O)\LexOthers.obj: ..\src\LexOthers.cxx ..\include\Platform.h ..\include\PropSet.h \ ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h + ..\include\Scintilla.h ..\include\SciLexer.h $(DIR_O)\LexPerl.obj: ..\src\LexPerl.cxx ..\include\Platform.h ..\include\PropSet.h \ ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h + ..\include\Scintilla.h ..\include\SciLexer.h $(DIR_O)\LexPascal.obj: ..\src\LexPascal.cxx ..\include\Platform.h ..\include\PropSet.h \ ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h + ..\include\Scintilla.h ..\include\SciLexer.h $(DIR_O)\LexPython.obj: ..\src\LexPython.cxx ..\include\Platform.h ..\include\PropSet.h \ ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h + ..\include\Scintilla.h ..\include\SciLexer.h $(DIR_O)\LexSQL.obj: ..\src\LexSQL.cxx ..\include\Platform.h ..\include\PropSet.h \ ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h + ..\include\Scintilla.h ..\include\SciLexer.h $(DIR_O)\LexVB.obj: ..\src\LexVB.cxx ..\include\Platform.h ..\include\PropSet.h \ ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h + ..\include\Scintilla.h ..\include\SciLexer.h $(DIR_O)\LineMarker.obj: ..\src\LineMarker.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\LineMarker.h |