* The grand 2005-2006 replace.

[lilypond.git] / lily / include / main.hh

diff --git a/lily/include/main.hh b/lily/include/main.hh
index b8bd188db64e0e95bc58b810cad03c3d3865b885..a54ff5a39d66f732c6b41e46558f58969c30ebfa 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 #ifndef MAIN_HH
 #define MAIN_HH
@@ -35,6 +35,7 @@ extern bool is_pango_format_global;
 extern bool is_TeX_format_global;
 extern bool point_and_click_global;
 extern String prefix_directory;
+extern bool use_object_keys;
 
 /*
   todo: collect in Output_option struct?
@@ -48,13 +49,16 @@ extern bool make_print;
 extern Array<String> failed_files;
 extern int exit_status_global;
 extern File_path global_path;
+extern const char *LILYPOND_DATADIR;
+
 
 /*
   Debugging options: switch on
+
+  Cannot switch on -DNDEBUG, because it causes weird errors if you mix
+  DNDEBUG and normal builds.
 */
 
-#ifndef NDEBUG
 #define DEBUG_SLUR_SCORING 1
-#endif
 
 #endif /* MAIN_HH */