From f3a492d8e1891544fd0ef89590b1560715968ced Mon Sep 17 00:00:00 2001 From: pabs Date: Sat, 10 Feb 2007 01:31:06 +0000 Subject: [PATCH] Build synfig_icon.ico as well as sif_icon.ico Install Win32 icons into the pixmaps directory too Fix 1655158: Use the .ico files instead of synfigstudio.exe Fix 1655155: Remove unused images from the Win32 installer package Fix 1655149: Generate the correct BMP format with imagemagick 6 Patches by Dmitriy Pomerantsev (Atrus) git-svn-id: http://svn.voria.com/code@237 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/Makefile.am | 5 +++-- synfig-studio/trunk/images/Makefile.am | 2 +- synfig-studio/trunk/win32inst.nsi.in | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am index eac6458..254d18b 100644 --- a/synfig-studio/trunk/Makefile.am +++ b/synfig-studio/trunk/Makefile.am @@ -88,8 +88,9 @@ win32inst.nsi: $(srcdir)/win32inst.nsi.in ./config.status win32inst.nsi package-win32: all win32inst.nsi - convert images/installer_logo.png images/installer_logo.bmp - make -C images sif_icon.ico + convert images/installer_logo.png bmp3:images/installer_logo.bmp + rm images/installer_logo*.png + make -C images sif_icon.ico synfig_icon.ico makensis win32inst.nsi package-osx: all pkg-info/macosx/synfig-studio.info diff --git a/synfig-studio/trunk/images/Makefile.am b/synfig-studio/trunk/images/Makefile.am index deec44c..6ebd87a 100644 --- a/synfig-studio/trunk/images/Makefile.am +++ b/synfig-studio/trunk/images/Makefile.am @@ -25,7 +25,7 @@ PNGTOICO=png2ico p2i=`which $(PNGTOICO)` cp -f $${p2i}.* ./ $(PNGTOICO) $@ $*-16x16.png $*-32x32.png $*-64x64.png - rm -f ./$(PNGTOICO).* + rm -f ./$(PNGTOICO).* $*-16x16.png $*-32x32.png $*-64x64.png clean: $(RM) $(CLEANFILES) diff --git a/synfig-studio/trunk/win32inst.nsi.in b/synfig-studio/trunk/win32inst.nsi.in index ab9f423..7c6f388 100644 --- a/synfig-studio/trunk/win32inst.nsi.in +++ b/synfig-studio/trunk/win32inst.nsi.in @@ -59,7 +59,7 @@ Section "Synfig Studio" SetOutPath "$INSTDIR\share\pixmaps" File "images\*.png" - SetOutPath "$INSTDIR\share" + SetOutPath "$INSTDIR\share\pixmaps" File "images\*.ico" SetOutPath "$INSTDIR\bin" @@ -96,7 +96,7 @@ Section "Synfig Studio" WriteRegStr HKCR ".sif.gz" "PerceivedType" "image" WriteRegStr HKCR "Synfig.Composition" "" "Synfig Composition File" - WriteRegStr HKCR "Synfig.Composition\DefaultIcon" "" "$INSTDIR\bin\synfigstudio.exe;1" + WriteRegStr HKCR "Synfig.Composition\DefaultIcon" "" "$INSTDIR\share\pixmaps\sif_icon.ico" WriteRegStr HKCR "Synfig.Composition\shell" "" "open" WriteRegStr HKCR "Synfig.Composition\shell\open\command" "" '$INSTDIR\bin\synfigstudio.exe "%1"' @@ -110,7 +110,7 @@ Section "Start Menu Shortcuts" CreateDirectory "$SMPROGRAMS\Voria" CreateShortCut "$SMPROGRAMS\Voria\Uninstall Synfig Studio.lnk" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" "" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" 0 - CreateShortCut "$SMPROGRAMS\Voria\Synfig Studio.lnk" "$INSTDIR\bin\synfigstudio.exe" "" "$INSTDIR\bin\synfigstudio.exe" 0 + CreateShortCut "$SMPROGRAMS\Voria\Synfig Studio.lnk" "$INSTDIR\bin\synfigstudio.exe" "" "$INSTDIR\share\pixmaps\synfig_icon.ico" 0 SectionEnd -- 2.7.4