diff options
| author | nyamatongwe <unknown> | 2003-01-10 11:35:51 +0000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2003-01-10 11:35:51 +0000 |
| commit | 24c70bc61d6674bb990db28a18480b2e22cc8156 (patch) | |
| tree | 17d50b0390b19403e28ab752e32addf9c302f090 | |
| parent | f06d95b0dad2ce395f3580c0ebd18e0e715865a7 (diff) | |
| download | scintilla-mirror-24c70bc61d6674bb990db28a18480b2e22cc8156.tar.gz | |
XPM separated from LineMarker and XPMSet implemented.
| -rw-r--r-- | gtk/makefile | 4 | ||||
| -rw-r--r-- | gtk/scintilla.mak | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/gtk/makefile b/gtk/makefile index 71682024a..95105514b 100644 --- a/gtk/makefile +++ b/gtk/makefile @@ -45,7 +45,7 @@ LEXOBJS=\ LexAda.o LexAsm.o LexAVE.o LexBaan.o LexBullant.o LexConf.o LexCPP.o \ LexCrontab.o LexCSS.o LexEiffel.o LexFortran.o LexHTML.o LexLisp.o LexLua.o \ LexMatlab.o LexOthers.o LexPascal.o LexPerl.o LexPython.o LexRuby.o LexSQL.o \ -LexVB.o +LexVB.o #--Autogenerated -- end of automatically generated section # The LEXOBJS have to be treated specially as the functions in them are not called from external code @@ -61,7 +61,7 @@ deps: $(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \ ScintillaBase.o ContractionState.o Editor.o PropSet.o PlatGTK.o \ KeyMap.o LineMarker.o ScintillaGTK.o CellBuffer.o ViewStyle.o \ - RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o + RESearch.o Style.o Indicator.o AutoComplete.o UniConversion.o XPM.o $(AR) rc $@ $^ $(RANLIB) $@ diff --git a/gtk/scintilla.mak b/gtk/scintilla.mak index 2b94d6bd5..5d80cfdb8 100644 --- a/gtk/scintilla.mak +++ b/gtk/scintilla.mak @@ -2,7 +2,7 @@ # Borland C++ does not work # Copyright 1998-2000 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: @@ -57,14 +57,14 @@ LIBS=$(GTK_LIBS) !IFDEF QUIET CC=@$(CC) -CXXDEBUG=$(CXXDEBUG) /nologo +CXXDEBUG=$(CXXDEBUG) /nologo CXXNDEBUG=$(CXXNDEBUG) /nologo LDFLAGS=$(LDFLAGS) /nologo !ENDIF !ELSE # BORLAND -!error Borland C++ not supported +!error Borland C++ not supported CC=bcc32 RC=brcc32 -r @@ -113,7 +113,8 @@ SOBJS=\ $(DIR_O)\ScintillaGTK.obj \ $(DIR_O)\Style.obj \ $(DIR_O)\UniConversion.obj \ - $(DIR_O)\ViewStyle.obj + $(DIR_O)\ViewStyle.obj \ + $(DIR_O)\XPM.obj #++Autogenerated -- run src/LexGen.py to regenerate #**LEXOBJS=\\\n\(\t$(DIR_O)\\\*.obj \\\n\) @@ -164,6 +165,7 @@ LOBJS=\ $(DIR_O)\StyleContext.obj \ $(DIR_O)\UniConversion.obj \ $(DIR_O)\ViewStyle.obj \ + $(DIR_O)\XPM.obj \ $(LEXOBJS) !IF "$(VENDOR)"=="MICROSOFT" @@ -220,7 +222,7 @@ $(DIR_O)\ScintillaGTKS.obj: ScintillaGTK.cxx LEX_HEADERS=..\include\Platform.h ..\include\PropSet.h \ ..\include\SString.h ..\include\Accessor.h ..\include\KeyWords.h \ ..\include\Scintilla.h ..\include\SciLexer.h ..\src\StyleContext.h - + $(DIR_O)\AutoComplete.obj: ..\src\AutoComplete.cxx ..\include\Platform.h ..\src\AutoComplete.h $(DIR_O)\CallTip.obj: ..\src\CallTip.cxx ..\include\Platform.h ..\src\CallTip.h @@ -243,7 +245,7 @@ $(DIR_O)\Indicator.obj: ..\src\Indicator.cxx ..\include\Platform.h ..\include\Sc $(DIR_O)\KeyMap.obj: ..\src\KeyMap.cxx ..\include\Platform.h ..\include\Scintilla.h ..\src\KeyMap.h $(DIR_O)\KeyWords.obj: ..\src\KeyWords.cxx ..\include\Platform.h ..\include\PropSet.h ..\include\Accessor.h ..\include\KeyWords.h \ - ..\include\Scintilla.h ..\include\SciLexer.h + ..\include\Scintilla.h ..\include\SciLexer.h #++Autogenerated -- run src/LexGen.py to regenerate #**\n\($(DIR_O)\\\*.obj: ..\\src\\\*.cxx $(LEX_HEADERS)\n\n\) |