lilypond-0.0.50

diff --git a/lib/include/input.hh b/lib/include/input.hh
index 180baf170be87d21e05858ff2d415b512b846293..f87385c4280b384a92738e1021c964fbc9fb0f3f 100644 (file)
--- a/lib/include/input.hh
+++ b/lib/include/input.hh
@@ -26,6 +26,7 @@ public:
     String location_str()const;
     Input(Source_file*, char const*);
     Input();
+    Input( Input const& );
 };
 
 #endif // INPUT_HH

diff --git a/lily/.version b/lily/.version
index a3bb0ea6504b542724cc9468d8935292c98ef0aa..93a395e794f370e7bb7d89b9868b950b7808a2f0 100644 (file)
--- a/lily/.version
+++ b/lily/.version
@@ -1,6 +1,6 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 0
-PATCH_LEVEL = 48
+PATCH_LEVEL = 49
 # use to send patches, always empty for released version:
 # include separator: ".postfix", "-pl" makes rpm barf
 

diff --git a/lily/global-regs.cc b/lily/global-regs.cc
index 207cc16c556a92ede8d1abba3fcca254f09c1100..3451ca5270a231fc51d18c95cb5ee251d2fb1528 100644 (file)
--- a/lily/global-regs.cc
+++ b/lily/global-regs.cc
@@ -6,6 +6,8 @@
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
+#include "proto.hh"
+#include "plist.hh"
 #include "input-register.hh"
 #include "debug.hh"
 #include "register.hh"

diff --git a/lily/include/key.hh b/lily/include/key.hh
index cbffa1e8f7d33562ab83268c99afff77302cbae2..38885f4a18969250da1822c2920f4b8fa82a64df 100644 (file)
--- a/lily/include/key.hh
+++ b/lily/include/key.hh
@@ -16,7 +16,7 @@ class Octave_key {
 public:
     Array<int> accidental_i_arr_;
  
-    Key();
+    Octave_key();
     void set(int i, int acc);
     int acc(int i)const { return accidental_i_arr_[i]; }
 };

diff --git a/lily/staff-info.cc b/lily/staff-info.cc
index b6fb13d347cdddaf69bb8efbb0da4aaf2b8289e2..b2b1e7250443255da7e706835f1f195722b85bb7 100644 (file)
--- a/lily/staff-info.cc
+++ b/lily/staff-info.cc
@@ -4,8 +4,9 @@
   source file of the LilyPond music typesetter
   (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
 */
-#include "staff.hh"
 #include "proto.hh"
+#include "plist.hh"
+#include "staff.hh"
 #include "staff-info.hh"
 #include "score-column.hh"
 #include "complex-walker.hh"

diff --git a/make/Configure_variables.make.in b/make/Configure_variables.make.in
index 21f29567fe16df3376984268fae62c55821e78c2..fe1d98c47ca855e31baffe10edd57450f559079e 100644 (file)
--- a/make/Configure_variables.make.in
+++ b/make/Configure_variables.make.in
@@ -5,7 +5,7 @@
 INSTALL = @INSTALL@
 USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@
 
-#CXX = @CXX@
+CXX = @CXX@
 libdir = @libdir@
 prefix = @prefix@
 TEXPREFIX = @TEXPREFIX@

diff --git a/make/Variables.make b/make/Variables.make
index 5ed24ca44eb0eb49a34c2053c6a953aac9dd16c7..e5fae4e8f0a87d883531816e3831b7dae2abef09 100644 (file)
--- a/make/Variables.make
+++ b/make/Variables.make
@@ -18,15 +18,10 @@ include ./$(depth)/.version
 #
 include ./$(depth)/make/out/Configure_variables.make
 
-# ugh, for win32 make
-# leave me up here, or i won-t work
-export CXX
-
 ifeq (0,${MAKELEVEL})
 MAKE:=$(MAKE) --no-builtin-rules
 endif
 
-
 # directory names:
 #
 outdir = out# "objects" won-t do, used for libs and deps as well