CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/05/28 20:01:54
Modified files:
lily : lilypond.rc.in GNUmakefile
Documentation/pictures: GNUmakefile
. : ChangeLog
Added files:
Documentation/pictures: ly-icon.xpm lilypond.xpm
Removed files:
Documentation/pictures: lilypond-48.xpm
Log message:
* lily/lilypond.rc.in: Add ly-icon.
* lily/GNUmakefile:
* Documentation/pictures/GNUmakefile (OUT_DIST_FILES): Add ly-icon
rules.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/lilypond.rc.in.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/GNUmakefile.diff?tr1=1.49&tr2=1.50&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/pictures/ly-icon.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/pictures/lilypond.xpm?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/pictures/GNUmakefile.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3672&tr2=1.3673&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3672 lilypond/ChangeLog:1.3673
--- lilypond/ChangeLog:1.3672 Sat May 28 13:43:23 2005
+++ lilypond/ChangeLog Sat May 28 20:01:54 2005
@@ -1,3 +1,12 @@
+2005-05-28 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * lily/lilypond.rc.in: Add ly-icon.
+
+ * lily/GNUmakefile:
+ * Documentation/pictures/GNUmakefile (OUT_DIST_FILES): Add ly-icon
+ rules.
+
+
2005-05-28 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/stencil-scheme.cc (LY_DEFINE): ly:stencil-in-color
Index: lilypond/Documentation/pictures/GNUmakefile
diff -u lilypond/Documentation/pictures/GNUmakefile:1.9
lilypond/Documentation/pictures/GNUmakefile:1.10
--- lilypond/Documentation/pictures/GNUmakefile:1.9 Mon May 16 23:25:37 2005
+++ lilypond/Documentation/pictures/GNUmakefile Sat May 28 20:01:54 2005
@@ -10,11 +10,13 @@
include $(depth)/make/stepmake.make
ifeq ($(PLATFORM_WINDOWS),yes)
-OUT_DIST_FILES = $(icon) # $(package-icon)
+OUT_DIST_FILES = $(lilypond-icon) $(ly-icon) # $(package-icon)
-icon = $(outdir)/lilypond.ico
ICON_SIZES=48 32 16
+lilypond-icon = $(outdir)/lilypond.ico
+ly-icon = $(outdir)/ly.ico
+
#$(outdir)/lilypond.ico: platte-lucht-kikker-ly-48.xpm
$(outdir)/%.ico: $(ICON_SIZES:%=$(outdir)/\%-%.png)
$(ICON_SIZES:%=$(outdir)/\%-%-8.png)
@@ -24,13 +26,13 @@
# cancel default rule that breaks transparency
$(outdir)/%.png: %.xpm
-$(outdir)/%-48.png: %-48.xpm
+$(outdir)/%-48.png: %.xpm
convert -sample 48 -depth 24 $< $@
-$(outdir)/%-32.png: %-48.xpm
+$(outdir)/%-32.png: %.xpm
convert -depth 24 -sample 32 $< $@
-$(outdir)/%-16.png: %-48.xpm
+$(outdir)/%-16.png: %.xpm
convert -depth 24 -sample 16 $< $@
$(outdir)/%-8.png: $(outdir)/%.png
Index: lilypond/lily/GNUmakefile
diff -u lilypond/lily/GNUmakefile:1.49 lilypond/lily/GNUmakefile:1.50
--- lilypond/lily/GNUmakefile:1.49 Sun May 15 23:50:18 2005
+++ lilypond/lily/GNUmakefile Sat May 28 20:01:54 2005
@@ -26,15 +26,19 @@
#
ifeq ($(PLATFORM_WINDOWS),yes)
-WINDRES_FLAGS += -DLilyPond=1
+WINDRES_FLAGS += -DLilyPond=0 -DLY=1
O_FILES += $(outdir)/lilypond.rc.o
$(outdir)/lilypond: $(outdir)/lilypond.rc.o
-$(outdir)/lilypond.rc.o: $(outdir)/lilypond.ico
+$(outdir)/lilypond.rc.o: $(outdir)/lilypond.ico $(outdir)/ly.ico
$(builddir)/Documentation/pictures/$(outbase)/lilypond.ico:
$(MAKE) -C $(abs-srcdir)/Documentation/pictures
$(outdir)/lilypond.ico:
$(builddir)/Documentation/pictures/$(outbase)/lilypond.ico
cp $< $@
+$(builddir)/Documentation/pictures/$(outbase)/ly.ico:
+ $(MAKE) -C $(abs-srcdir)/Documentation/pictures
+$(outdir)/lilypond.ico: $(builddir)/Documentation/pictures/$(outbase)/ly.ico
+ cp $< $@
endif
ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *(\([^,]+\)/\1/'
Index: lilypond/lily/lilypond.rc.in
diff -u lilypond/lily/lilypond.rc.in:1.1 lilypond/lily/lilypond.rc.in:1.2
--- lilypond/lily/lilypond.rc.in:1.1 Thu May 12 11:33:13 2005
+++ lilypond/lily/lilypond.rc.in Sat May 28 20:01:54 2005
@@ -1,6 +1,7 @@
#include <winver.h>
LilyPond ICON "@outdir@/lilypond.ico"
+LY ICON "@outdir@/ly.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION @MAJOR_VERSION@,@MINOR_VERSION@,@PATCH_LEVEL@,@BUILD_VERSION@
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
