SF.net SVN: geany:[5442] branches/unstable
eht16 at users.sourceforge.net
eht16 at xxxxx
Wed Nov 24 23:14:59 UTC 2010
Revision: 5442
http://geany.svn.sourceforge.net/geany/?rev=5442&view=rev
Author: eht16
Date: 2010-11-24 23:14:59 +0000 (Wed, 24 Nov 2010)
Log Message:
-----------
Update Windows-Makefile-based build system for Scintilla.
Modified Paths:
--------------
branches/unstable/ChangeLog
branches/unstable/scintilla/makefile.win32
Modified: branches/unstable/ChangeLog
===================================================================
--- branches/unstable/ChangeLog 2010-11-24 21:43:31 UTC (rev 5441)
+++ branches/unstable/ChangeLog 2010-11-24 23:14:59 UTC (rev 5442)
@@ -8,6 +8,8 @@
Update Waf-based build system for Scintilla.
* scintilla/Makefile.am, scintilla/include/Makefile.am:
Update autotools-based build system for Scintilla.
+ * scintilla/makefile.win32:
+ Update Windows-Makefile-based build system for Scintilla.
2010-11-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: branches/unstable/scintilla/makefile.win32
===================================================================
--- branches/unstable/scintilla/makefile.win32 2010-11-24 21:43:31 UTC (rev 5441)
+++ branches/unstable/scintilla/makefile.win32 2010-11-24 23:14:59 UTC (rev 5442)
@@ -31,11 +31,12 @@
-I$(PREFIX)/include
-vpath %.h . include
-vpath %.cxx .
+vpath %.h gtk lexers lexlib src include
+vpath %.cxx gtk lexers lexlib src
+vpath %.c gtk
-INCLUDEDIRS=-I include -I . $(GTK_INCLUDES)
-CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -DGTK -DGTK2 -DSCI_LEXER $(INCLUDEDIRS) -mms-bitfields
+INCLUDEDIRS=-I include -I src -I lexlib -I . $(GTK_INCLUDES)
+CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -DGTK -DSCI_LEXER $(INCLUDEDIRS) -mms-bitfields
ifdef THREADS
THREADFLAGS=
@@ -57,32 +58,86 @@
.c.o:
$(CCOMP) $(CXXFLAGS) -w -c $<
-#++Autogenerated -- run src/LexGen.py to regenerate
-#**LEXOBJS=\\\n\(\*.o \)
LEXOBJS=\
-LexAda.o LexBash.o LexAsm.o LexCSS.o LexCPP.o LexHTML.o LexOthers.o LexPascal.o \
-LexPerl.o LexPython.o LexSQL.o LexCaml.o LexTCL.o LexTxt2tags.o LexRuby.o \
-LexErlang.o LexForth.o LexFortran.o LexVHDL.o LexVerilog.o \
-LexMarkdown.o LexMatlab.o \
-LexD.o LexLisp.o LexLua.o LexHaskell.o LexBasic.o LexR.o LexYAML.o LexCmake.o LexNsis.o
-#--Autogenerated -- end of automatically generated section
+LexAda.o \
+LexAsm.o \
+LexBash.o \
+LexCSS.o \
+LexCPP.o \
+LexHTML.o \
+LexOthers.o \
+LexPascal.o \
+LexPerl.o \
+LexPython.o \
+LexSQL.o \
+LexCaml.o \
+LexTCL.o \
+LexTxt2tags.o \
+LexRuby.o \
+LexErlang.o \
+LexForth.o \
+LexFortran.o \
+LexVHDL.o \
+LexVerilog.o \
+LexMarkdown.o \
+LexMatlab.o \
+LexD.o \
+LexLisp.o \
+LexLua.o \
+LexHaskell.o \
+LexBasic.o \
+LexR.o \
+LexYAML.o \
+LexCmake.o \
+LexNsis.o
all: $(COMPLIB)
clean:
-$(RM) deps.mak *.o $(COMPLIB)
-$(COMPLIB): DocumentAccessor.o WindowAccessor.o KeyWords.o StyleContext.o Document.o CallTip.o \
- ScintillaBase.o ContractionState.o Editor.o ExternalLexer.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 CharClassify.o XPM.o \
- RunStyles.o Decoration.o PositionCache.o PerLine.o Selection.o \
- $(MARSHALLER) $(LEXOBJS)
+SRCOBJS=\
+ PlatGTK.o \
+ ScintillaGTK.o \
+ Accessor.o \
+ CharacterSet.o \
+ LexerBase.o \
+ LexerModule.o \
+ LexerNoExceptions.o \
+ LexerSimple.o \
+ PropSetSimple.o \
+ StyleContext.o \
+ WordList.o \
+ AutoComplete.o \
+ CallTip.o \
+ Catalogue.o \
+ CellBuffer.o \
+ CharClassify.o \
+ ContractionState.o \
+ Decoration.o \
+ Document.o \
+ Editor.o \
+ ExternalLexer.o \
+ Indicator.o \
+ KeyMap.o \
+ LineMarker.o \
+ PerLine.o \
+ PositionCache.o \
+ RESearch.o \
+ RunStyles.o \
+ ScintillaBase.o \
+ Selection.o \
+ Style.o \
+ UniConversion.o \
+ ViewStyle.o \
+ XPM.o
+
+$(COMPLIB): $(MARSHALLER) $(LEXOBJS) $(SRCOBJS)
$(AR) rc $@ $^
$(RANLIB) $@
deps.mak:
- $(CC) -MM $(CXXFLAGS) *.cxx >deps.mak
+ $(CC) -MM $(CXXFLAGS) gtk\*.cxx lexers\*.cxx lexlib\*.cxx src\*.cxx >deps.mak
# Generate header dependencies with "make deps.mak"
include deps.mak
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list