CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Jan Nieuwenhuizen <[EMAIL PROTECTED]>   05/05/12 11:32:49

Modified files:
        stepmake/stepmake: c-rules.make c++-rules.make 
        stepmake       : aclocal.m4 
        scripts        : GNUmakefile 
        scm            : lily.scm 
        make           : substitute.make stepmake.make 
        lily           : main.cc font-metric.cc GNUmakefile 
        flower/include : string.hh 
        flower         : string.cc file-name.cc 
        Documentation/user: point-and-click.itely 
        .              : configure.in config.make.in config.hh.in 
                         ChangeLog 

Log message:
        * flower/string.cc (substitute): Take two strings or two
        characters.  Update callers.
        
        * flower/file-name.cc (File_name): Slashify.
        
        * scm/lily.scm: Use gui-main iso lilypond-main on MINGW.
        
        * scripts/GNUmakefile (SEXECUTABLES): Add lilypond-invoke-editor.
        
        * stepmake/aclocal.m4 (STEPMAKE_WINDOWS): New function.
        
        * configure.in (gui_b): Use it.
        
        * lily/lilypond.rc.in: New file.
        
        * lily/GNUmakefile[PLATFROM_WINDOWS]: Compile it into executable.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/stepmake/stepmake/c-rules.make.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/stepmake/stepmake/c++-rules.make.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/stepmake/aclocal.m4.diff?tr1=1.141&tr2=1.142&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scripts/GNUmakefile.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/lily.scm.diff?tr1=1.334&tr2=1.335&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/make/substitute.make.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/make/stepmake.make.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/main.cc.diff?tr1=1.248&tr2=1.249&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/font-metric.cc.diff?tr1=1.97&tr2=1.98&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/GNUmakefile.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/include/string.hh.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/string.cc.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/flower/file-name.cc.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/point-and-click.itely.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/configure.in.diff?tr1=1.151&tr2=1.152&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/config.make.in.diff?tr1=1.78&tr2=1.79&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/config.hh.in.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3600&tr2=1.3601&r1=text&r2=text

Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3600 lilypond/ChangeLog:1.3601
--- lilypond/ChangeLog:1.3600   Thu May 12 11:08:00 2005
+++ lilypond/ChangeLog  Thu May 12 11:32:49 2005
@@ -1,3 +1,24 @@
+2005-05-12  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
+
+       * flower/string.cc (substitute): Take two strings or two
+       characters.  Update callers.
+
+2005-05-11  Jan Nieuwenhuizen  <[EMAIL PROTECTED]>
+
+       * flower/file-name.cc (File_name): Slashify.
+
+       * scm/lily.scm: Use gui-main iso lilypond-main on MINGW.
+
+       * scripts/GNUmakefile (SEXECUTABLES): Add lilypond-invoke-editor.
+
+       * stepmake/aclocal.m4 (STEPMAKE_WINDOWS): New function.
+
+       * configure.in (gui_b): Use it.
+
+       * lily/lilypond.rc.in: New file.
+
+       * lily/GNUmakefile[PLATFROM_WINDOWS]: Compile it into executable.
+
 2005-05-12  Graham Percival  <[EMAIL PROTECTED]>
 
        * Documentation/user/advanced-notation.itely: edit of Text
@@ -32,6 +53,7 @@
        * input/test/volta-chord-names.ly: Bring the explanation up to
        date.
 
+>>>>>>> 1.3600
 2005-05-11  Heikki Junes  <[EMAIL PROTECTED]>
 
         * Documentation/topdocs/{AUTHORS.texi,INSTALL.texi,README.texi}:
Index: lilypond/Documentation/user/point-and-click.itely
diff -u lilypond/Documentation/user/point-and-click.itely:1.10 
lilypond/Documentation/user/point-and-click.itely:1.11
--- lilypond/Documentation/user/point-and-click.itely:1.10      Sun Apr  3 
20:29:46 2005
+++ lilypond/Documentation/user/point-and-click.itely   Thu May 12 11:32:49 2005
@@ -35,6 +35,15 @@
 file is found in your home-directory under
 @file{.mozilla/firefox/default.trn/prefs.js}.}  
 
[EMAIL PROTECTED]
+mozilla wants us do store this in user.js:
+http://www.mozilla.org/support/firefox/edit#user
+
+location on different systems:
+http://www.mozilla.org/support/firefox/edit#profile
+
[EMAIL PROTECTED] ignore
+
 @example
 user_pref("network.protocol-handler.app.textedit", "lilypond-pdfpc-helper");
 user_pref("network.protocol-handler.warn-external.textedit", false);
Index: lilypond/config.hh.in
diff -u lilypond/config.hh.in:1.43 lilypond/config.hh.in:1.44
--- lilypond/config.hh.in:1.43  Mon May  2 12:39:28 2005
+++ lilypond/config.hh.in       Thu May 12 11:32:49 2005
@@ -74,6 +74,9 @@
 #define DIRSEP '@DIRSEP@'
 #define PATHSEP '@PATHSEP@'
 
+/* define if you have some kind of windows platform */
+#define PLATFORM_WINDOWS 0
+
 /* define if you have assert.h */
 #define HAVE_ASSERT_H 0
 
Index: lilypond/config.make.in
diff -u lilypond/config.make.in:1.78 lilypond/config.make.in:1.79
--- lilypond/config.make.in:1.78        Mon Apr 18 14:57:41 2005
+++ lilypond/config.make.in     Thu May 12 11:32:49 2005
@@ -100,6 +100,7 @@
 PAPERSIZE=a4
 PATHSEP = @PATHSEP@
 PERL = @PERL@
+PLATFORM_WINDOWS = @PLATFORM_WINDOWS@
 PYTHON = @PYTHON@
 RANLIB = @RANLIB@
 ROOTSEP = @ROOTSEP@
@@ -107,5 +108,6 @@
 SPLITTING_MAKEINFO = @SPLITTING_MAKEINFO@
 TAR = @TAR@
 TTFTOOL_ENDIAN = @TTFTOOL_ENDIAN@
+WINDRES = @WINDRES@
 YACC = @YACC@
 ZIP = @ZIP@
Index: lilypond/configure.in
diff -u lilypond/configure.in:1.151 lilypond/configure.in:1.152
--- lilypond/configure.in:1.151 Mon May  9 19:47:33 2005
+++ lilypond/configure.in       Thu May 12 11:32:49 2005
@@ -85,6 +85,8 @@
                TTFTOOL_ENDIAN="-DSMALLENDIAN")
 AC_SUBST(TTFTOOL_ENDIAN)
 
+STEPMAKE_WINDOWS
+
 ## Optional tools for building documentation, website, extra fonts.
 
 # guile executable for some scripts
Index: lilypond/flower/file-name.cc
diff -u lilypond/flower/file-name.cc:1.6 lilypond/flower/file-name.cc:1.7
--- lilypond/flower/file-name.cc:1.6    Thu Mar 10 14:36:16 2005
+++ lilypond/flower/file-name.cc        Thu May 12 11:32:49 2005
@@ -72,11 +72,14 @@
 File_name::File_name (String file_name)
 {
 #ifdef __CYGWIN__
-  /* All system functions would work, even if we don't convert to
-     posix file_name, but we'd think that \foe\bar\baz.ly is in the cwd.
-     On by default.  */
+  /* All system functions would work, even if we do not convert to
+     posix file_name, but we would think that \foe\bar\baz.ly is in
+     the cwd.  */
   file_name = dos_to_posix (file_name);
 #endif
+#ifdef __MINGW32__
+  file_name.substitute ('\\', '/');
+#endif
 
   int i = file_name.index (ROOTSEP);
   if (i >= 0)
Index: lilypond/flower/include/string.hh
diff -u lilypond/flower/include/string.hh:1.32 
lilypond/flower/include/string.hh:1.33
--- lilypond/flower/include/string.hh:1.32      Wed Mar 16 19:19:15 2005
+++ lilypond/flower/include/string.hh   Thu May 12 11:32:49 2005
@@ -144,7 +144,8 @@
   /// convert to a double
   double to_double () const;
 
-  void substitute_char (char text, String sub);
+  void substitute (String find, String replace);
+  void substitute (char find, char replace);
 };
 
 /*
Index: lilypond/flower/string.cc
diff -u lilypond/flower/string.cc:1.49 lilypond/flower/string.cc:1.50
--- lilypond/flower/string.cc:1.49      Mon May  2 12:39:28 2005
+++ lilypond/flower/string.cc   Thu May 12 11:32:49 2005
@@ -383,8 +383,16 @@
 #endif
 
 void
-String::substitute_char (char chr, String sub)
+String::substitute (String find, String replace)
 {
-  for (int i = index (chr); i > -1; i = index (chr))
-    *this = left_string (i) + sub + right_string (length () - i - 1);
+  int n = replace.length ();
+  for (int i = index (find); i > - 1; i = index (find))
+    *this = left_string (i) + find + right_string (length () - i - n);
+}
+
+void
+String::substitute (char find, char replace)
+{
+  for (int i = index (find); i > - 1; i = index (find))
+    (*this)[i] = replace;
 }
Index: lilypond/lily/GNUmakefile
diff -u lilypond/lily/GNUmakefile:1.44 lilypond/lily/GNUmakefile:1.45
--- lilypond/lily/GNUmakefile:1.44      Sun Apr 24 22:32:17 2005
+++ lilypond/lily/GNUmakefile   Thu May 12 11:32:49 2005
@@ -9,7 +9,7 @@
 MODULE_CXXFLAGS=
 
 HELP2MAN_EXECS = lilypond
-STEPMAKE_TEMPLATES= c++ executable po help2man
+STEPMAKE_TEMPLATES=c c++ executable po help2man
 
 OUT_DIST_FILES=$(addprefix $(outdir)/,parser.cc parser.hh)
 
@@ -25,6 +25,16 @@
 # USER_LDFLAGS += -static -lltdl -ldl
 #
 
+ifeq ($(PLATFORM_WINDOWS),yes)
+WINDRES_FLAGS += -DLilyPond=1
+O_FILES += $(outdir)/lilypond.rc.o
+$(outdir)/lilypond: $(outdir)/lilypond.rc.o
+
+$(outdir)/lilypond.rc.o: $(outdir)/lilypond.ico
+$(outdir)/lilypond.ico: $(abs-srcdir)/Documentation/pictures/lelie-logo.xpm
+       convert $< $@ 
+endif
+
 ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *(\([^,]+\)/\1/'
 ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *([^"]*"\([^"]+\)"/\1/'
 
@@ -48,3 +58,4 @@
 ifneq ($(srcdir), .)
 .PRECIOUS: $(outdir)/lexer.cc $(outdir)/parser.cc
 endif
+
Index: lilypond/lily/font-metric.cc
diff -u lilypond/lily/font-metric.cc:1.97 lilypond/lily/font-metric.cc:1.98
--- lilypond/lily/font-metric.cc:1.97   Thu Mar 10 14:36:13 2005
+++ lilypond/lily/font-metric.cc        Thu May 12 11:32:49 2005
@@ -31,7 +31,7 @@
 Stencil
 Font_metric::find_by_name (String s) const
 {
-  s.substitute_char ('-', "M");
+  s.substitute ('-', 'M');
   int idx = name_to_index (s);
   Box b;
 
Index: lilypond/lily/main.cc
diff -u lilypond/lily/main.cc:1.248 lilypond/lily/main.cc:1.249
--- lilypond/lily/main.cc:1.248 Wed May 11 11:14:13 2005
+++ lilypond/lily/main.cc       Thu May 12 11:32:49 2005
@@ -596,12 +596,12 @@
   setup_localisation ();
   setup_paths ();
   parse_argv (argc, argv);
+  /* FIXME: this still needs a terminal even when using gui-main after
+     booting guile.  Maybe use a --quiet command line switch?  */
   identify (stderr);
 
   scm_boot_guile (argc, argv, main_with_guile, 0);
 
-  /*
-    If we get here, GUILE exited. This is an error.
-   */
+  /* Only reachable if GUILE exits.  That is an error.  */
   return 1;
 }
Index: lilypond/make/stepmake.make
diff -u lilypond/make/stepmake.make:1.24 lilypond/make/stepmake.make:1.25
--- lilypond/make/stepmake.make:1.24    Mon Apr 25 14:16:50 2005
+++ lilypond/make/stepmake.make Thu May 12 11:32:49 2005
@@ -35,6 +35,8 @@
 endif
 
 include $(depth)/make/toplevel-version.make
+MICRO_VERSION=$(PATCH_LEVEL)
+BUILD_VERSION=1
 
 # Use alternate configurations alongside eachother:
 #
Index: lilypond/make/substitute.make
diff -u lilypond/make/substitute.make:1.14 lilypond/make/substitute.make:1.15
--- lilypond/make/substitute.make:1.14  Sun Dec 12 11:05:59 2004
+++ lilypond/make/substitute.make       Thu May 12 11:32:49 2005
@@ -6,10 +6,15 @@
 
 ATVARIABLES = \
   BASH\
+  BUILD_VERSION\
   DATE\
   FONTFORGE\
   GUILE\
+  MICRO_VERSION\
+  MAJOR_VERSION\
+  MINOR_VERSION\
   PACKAGE\
+  PATCH_LEVEL\
   PATHSEP\
   PERL\
   PYTHON\
@@ -23,9 +28,11 @@
   local_lilypond_datadir\
   local_lilypond_libdir\
   localedir\
+  outdir\
   package\
   prefix\
   program_prefix\
   program_suffix\
   sharedstatedir\
+  srcdir\
   step-bindir\
Index: lilypond/scm/lily.scm
diff -u lilypond/scm/lily.scm:1.334 lilypond/scm/lily.scm:1.335
--- lilypond/scm/lily.scm:1.334 Tue May 10 21:58:45 2005
+++ lilypond/scm/lily.scm       Thu May 12 11:32:49 2005
@@ -15,8 +15,9 @@
             (ice-9 safe)
              (ice-9 optargs)
             (oop goops)
-            (srfi srfi-1)  ;; lists
-            (srfi srfi-13)) ;; strings
+            (srfi srfi-1)
+            (srfi srfi-13)
+            (srfi srfi-14))
 
 
 ;; my display
@@ -343,6 +344,7 @@
         (log-file (open-file log-name "w")))
     (display "# -*-compilation-*-" log-file)
     (newline log-file)
+    ;; Ugh, this opens a terminal
     (ly:message (_ "Redirecting output to ~a...") log-name)
     (ly:port-move (fileno (current-error-port)) log-file)
     (if (null? (lilypond-all files))
@@ -361,5 +363,22 @@
         (cmd (get-editor-command ly 0 0)))
     (system cmd)))
 
-;; FIXME
-;; (define lilypond-main gui-main)
+
+;; Mingw
+;; #(Windows XP HOSTNAME build 2600 5.01 Service Pack 1 i686)
+
+;; Cygwin
+;; #(CYGWIN_NT-5.1 Hostname 1.5.12(0.116/4/2) 2004-11-10 08:34 i686)
+
+;; Debian
+;; #(Linux hostname 2.4.27-1-686 #1 Fri Sep 3 06:28:00 UTC 2004 i686)
+
+(case (string->symbol
+       (string-downcase
+       (car (string-tokenize (vector-ref (uname) 0) char-set:letter))))
+  ((linux) #t)
+  ;; On mingw, use gui-main
+  ((windows) (define lilypond-main gui-main)))
+
+;;(if (ly:get-option 'quiet)
+;;    (define lilypond-main gui-main))
Index: lilypond/scripts/GNUmakefile
diff -u lilypond/scripts/GNUmakefile:1.25 lilypond/scripts/GNUmakefile:1.26
--- lilypond/scripts/GNUmakefile:1.25   Tue May  3 11:31:51 2005
+++ lilypond/scripts/GNUmakefile        Thu May 12 11:32:49 2005
@@ -1,6 +1,6 @@
 depth = ..
 
-SEXECUTABLES=convert-ly lilypond-book abc2ly etf2ly mup2ly midi2ly 
lilypond-ps2png lilypond-pdfpc-helper
+SEXECUTABLES=convert-ly lilypond-book abc2ly etf2ly mup2ly midi2ly 
lilypond-ps2png lilypond-pdfpc-helper lilypond-invoke-editor
 
 STEPMAKE_TEMPLATES=script help2man po
 LOCALSTEPMAKE_TEMPLATES = lilypond
Index: lilypond/stepmake/aclocal.m4
diff -u lilypond/stepmake/aclocal.m4:1.141 lilypond/stepmake/aclocal.m4:1.142
--- lilypond/stepmake/aclocal.m4:1.141  Mon Apr 25 11:15:30 2005
+++ lilypond/stepmake/aclocal.m4        Thu May 12 11:32:49 2005
@@ -25,8 +25,7 @@
     ##
     ## -V: Workaround for python
 
-    changequote(<<, >>)dnl
-    ##set -x
+    changequote(<<, >>)#dnl
     ## Assume and hunt for dotted version multiplet.
     ## use eval trickery, because we cannot use multi-level $() instead of ``
     ## for compatibility reasons.
@@ -42,8 +41,7 @@
            | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
     fi
     echo "$_ver"
-    ##set +x
-    changequote([, ])dnl
+    changequote([, ])#dnl
 ])
 
 # Calculate simplistic numeric version from version string ($1)
@@ -519,11 +517,11 @@
     AC_SUBST(GUILE_CONFIG)
     
     guile_version="$ver"
-    changequote(<<, >>)dnl
+    changequote(<<, >>)#dnl
     GUILE_MAJOR_VERSION=`expr $guile_version : '\([0-9]*\)'`
     GUILE_MINOR_VERSION=`expr $guile_version : '[0-9]*\.\([0-9]*\)'`
     GUILE_PATCH_LEVEL=`expr $guile_version : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
-    changequote([, ])dnl
+    changequote([, ])#dnl
     STEPMAKE_GUILE_FLAGS
     save_CPPFLAGS="$CPPFLAGS"
     save_LIBS="$LIBS"
@@ -570,10 +568,10 @@
     fi
     export MAJOR_VERSION MINOR_VERSION PATCH_LEVEL
     # urg: don't "fix" this: irix doesn't know about [:lower:] and [:upper:]
-    changequote(<<, >>)dnl
+    changequote(<<, >>)#dnl
     PACKAGE=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'`
     package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'`
-    changequote([, ])dnl
+    changequote([, ])#dnl
 
     # No versioning on directory names of sub-packages 
     # urg, urg
@@ -708,26 +706,16 @@
            # STEPMAKE_WARN($warn)
            STEPMAKE_ADD_ENTRY(REQUIRED, $warn)
         fi
-    fi 
-
-    if test "$OSTYPE" = "cygwin" -o "$OSTYPE" = "cygwin32" -o "$OSTYPE" = 
"Windows_NT"; then
-       LN=cp # hard link does not work under cygnus-nt
-       LN_S='cp -r' # symbolic link does not work for native nt
-       ZIP="zip -r -9" #
-       program_suffix=.exe
-       ROOTSEP=':'
-        DIRSEP='/'
-       PATHSEP=':'
-       INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c"
-    else
-       ROOTSEP=':'
-       DIRSEP='/'
-       PATHSEP=':'
-       LN=ln
-       LN_S='ln -s'
-       ZIP="zip -r -9"
-        INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c"
     fi
+
+    ROOTSEP=':'
+    DIRSEP='/'
+    PATHSEP=':'
+    LN=ln
+    LN_S='ln -s'
+    ZIP="zip -r -9"
+    INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c"
+
     AC_SUBST(program_prefix)
     AC_SUBST(program_suffix)
     AC_SUBST(ZIP)
@@ -971,11 +959,11 @@
 AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
     unset PYTHON_HEADER PYTHON_INCLUDE
     if test -n "$PYTHON"; then
-       changequote(<<, >>)dnl
+       changequote(<<, >>)#dnl
        # alternatively, for python >= 2.0
        # 'import sys, distutils.sysconfig; sys.stdout.write 
(distutils.sysconfig.get_python_inc ())'
        PYTHON_INCLUDE=`$PYTHON -c 'import sys; sys.stdout.write 
("%s/include/python%s" % (sys.prefix, sys.version[:3]))'`
-       changequote([, ])dnl
+       changequote([, ])#dnl
     fi
     
     ##AC_CHECK_HEADERS([Python.h],[PYTHON_HEADER=yes])
@@ -1178,3 +1166,31 @@
        STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"])
     fi
 ])
+
+AC_DEFUN(STEPMAKE_WINDOWS, [
+    AC_CYGWIN
+    AC_MINGW32
+
+    if test "$CYGWIN" == "yes"; then
+       LN_S='cp -r' # Cygwin symbolic links do not work for native apps.
+       program_suffix=.exe
+       INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c"
+    elif test "$MINGW" == "yes"; then
+       LN='cp -r'
+       LN_S='cp -r'
+       program_suffix=.exe
+       INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c"
+       PATHSEP=';'
+    fi
+    
+    AC_MSG_CHECKING([for some flavor of Windows])
+    if test "$CYGWIN$MINGW32" == "nono"; then
+        PLATFORM_WINDOWS=no
+    else
+        PLATFORM_WINDOWS=yes
+    fi
+    AC_MSG_RESULT([$PLATFORM_WINDOWS])
+    AC_SUBST(PLATFORM_WINDOWS)
+    STEPMAKE_PROGS(WINDRES, $target-windres windres, x)
+    AC_SUBST(WINDRES)
+])
Index: lilypond/stepmake/stepmake/c++-rules.make
diff -u lilypond/stepmake/stepmake/c++-rules.make:1.9 
lilypond/stepmake/stepmake/c++-rules.make:1.10
--- lilypond/stepmake/stepmake/c++-rules.make:1.9       Thu Sep 18 10:05:05 2003
+++ lilypond/stepmake/stepmake/c++-rules.make   Thu May 12 11:32:49 2005
@@ -26,3 +26,6 @@
 
 $(outdir)/%.cc: %.ll
        $(FLEX) -Cfe -p -p -o$@ $< 
+
+$(outdir)/%-rc.o: $(outdir)/%.rc
+       $(WINDRES) $(WINDRES_FLAGS) -o$@ $<
Index: lilypond/stepmake/stepmake/c-rules.make
diff -u lilypond/stepmake/stepmake/c-rules.make:1.7 
lilypond/stepmake/stepmake/c-rules.make:1.8
--- lilypond/stepmake/stepmake/c-rules.make:1.7 Thu Sep 18 10:05:05 2003
+++ lilypond/stepmake/stepmake/c-rules.make     Thu May 12 11:32:49 2005
@@ -26,3 +26,5 @@
 # could be faster:
 #      $(FLEX) -8 -Cf -o$@ $< 
 
+$(outdir)/%.rc.o: $(outdir)/%.rc
+       $(WINDRES) $(WINDRES_FLAGS) -o$@ $<


_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to