From: fred Date: Sun, 24 Mar 2002 19:30:56 +0000 (+0000) Subject: lilypond-0.0.30 X-Git-Tag: release/1.5.59~5438 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ea4356bacb6468d5871c1238ee4fcaf8fcb928b0;p=lilypond.git lilypond-0.0.30 --- diff --git a/Variables.make b/Variables.make index c53033674c..38280146fd 100644 --- a/Variables.make +++ b/Variables.make @@ -1,8 +1,12 @@ +# -*-make-*- + # version info MAJVER=0 MINVER=0 -PATCHLEVEL=29 +PATCHLEVEL=30 + include Site.make + #### #### USER CONFIGURABLE #### @@ -23,7 +27,8 @@ EXTRACXXFLAGS=-pipe -Wall -W -Wmissing-prototypes # ElectricFence is a memory debugger which uses the # VM hardware to trap malloc/free errors. # -#EXTRALIB+=-lefence + +EXTRALIB= #+=-lefence #### #### END USER CONFIGURABLE part. @@ -47,18 +52,13 @@ CXXVER=`$(CXX) --version` # directories TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi) + OBJECTDIR=objects HEADERDIR=hdr CCDIR=src INITDIR=init DEPDIR=deps INPUTDIR=input -#vpath %.cc $(CCDIR) -#vpath %.hh $(HEADERDIR) -#vpath %.y $(CCDIR) -#vpath %.l $(CCDIR) -#vpath %.o $(OBJECTDIR) -#vpath %.dep $(DEPDIR) # # @@ -71,11 +71,12 @@ obs=$(addprefix $(OBJECTDIR)/,$(cc:.cc=.o)) ALLDEPS=$(addprefix $(DEPDIR)/,$(cc:.cc=.dep)) STABLEOBS=$(addprefix $(OBJECTDIR)/,$(stablecc:.cc=.o)) HEADERS=$(addprefix $(HEADERDIR)/,$(hdr)) -progdocs=$(HEADERS) $(addprefix $(CCDIR)/, $(mycc)) +progdocs=$(HEADERS) #$(CCSOURCE) + #dist .EXPORT_ALL_VARIABLES: -DOCDIR=docdir +DOCDIR=docxx PACKAGENAME=lilypond DNAME=$(PACKAGENAME)-$(VERSION) diff --git a/src/sccol.cc b/src/sccol.cc index 14c52796de..2d826094da 100644 --- a/src/sccol.cc +++ b/src/sccol.cc @@ -54,6 +54,7 @@ Score_column::preprocess() void Score_column::add_duration(Moment d) { + assert(d); for (int i = 0; i< durations.size(); i++) { if (d == durations[i]) return ;