X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fwin32inst.nsi.in;h=ff29e4aa27c7cb1657e719852157e1a98c4f4eea;hb=fc8add47e5b8cc920cd3ee31e4ded7b3623360b7;hp=0a2b56dea1db6db345545fe2ed7e2c869fce27a2;hpb=ff9ed7c6c97639724efbe1beee356c9c8011d19a;p=synfig.git

diff --git a/synfig-core/trunk/win32inst.nsi.in b/synfig-core/trunk/win32inst.nsi.in
index 0a2b56d..ff29e4a 100644
--- a/synfig-core/trunk/win32inst.nsi.in
+++ b/synfig-core/trunk/win32inst.nsi.in
@@ -12,7 +12,7 @@
 ; The name of the installer
 Name "@PACKAGE_NAME@ @PACKAGE_VERSION@"
 
-!define PRODUCT_WEB_SITE "http://voria.com/synfig/"
+!define PRODUCT_WEB_SITE "http://www.synfig.com/"
 
 ; The file to write
 OutFile "@PACKAGE_TARNAME@-@PACKAGE_VERSION@.exe"
@@ -48,7 +48,8 @@ InstallDirRegKey HKLM "Software\Voria_@PACKAGE_TARNAME@" "Install_Dir"
 ;CustomGuiInit
 
 !insertmacro MUI_PAGE_WELCOME
-!insertmacro MUI_PAGE_LICENSE "@srcdir@\alphalicense.txt"
+!insertmacro MUI_PAGE_LICENSE "@srcdir@\COPYING"
+#!insertmacro MUI_PAGE_LICENSE "@srcdir@\alphalicense.txt"
 ;Page custom PageReinstall ; PageLeaveReinstall
 !insertmacro MUI_PAGE_COMPONENTS
 !insertmacro MUI_PAGE_DIRECTORY
@@ -70,20 +71,16 @@ Section ""
   ; Set output path to the installation directory.
   SetOutPath $INSTDIR\bin
 
-  File "C:\mingw\bin\mingwm10.dll"
-  File "C:\GTK\bin\libfreetype-6.dll"
-  
   ; Put file there
-;  File "synfig_modules.conf"
   
   CreateDirectory "$INSTDIR\etc"
-  Delete $INSTDIR\etc\synfig_modules.conf
+  Delete $INSTDIR\etc\synfig_modules.cfg
 	
   ; Write the installation path into the registry
   ; WriteRegStr HKLM "Software\Voria_@PACKAGE_TARNAME@" "Install_Dir" "$INSTDIR"
   
   WriteRegStr HKLM "${SYNFIG_REG_KEY}" "Path" "$INSTDIR"
-  WriteRegStr HKLM "${SYNFIG_REG_KEY}" "Version" "@PRODUCT_VERSION@"
+  WriteRegStr HKLM "${SYNFIG_REG_KEY}" "Version" "@PACKAGE_VERSION@"
   
   ; Write the uninstall keys for Windows
   WriteRegStr HKLM "${SYNFIG_UNINSTALL_KEY}" "DisplayName" "@PACKAGE_NAME@"
@@ -105,6 +102,15 @@ SectionEnd
   
 ;SectionEnd
 
+; Optional section (can be disabled by the user)
+Section "Start Menu Shortcuts"
+
+  CreateDirectory "$SMPROGRAMS\Voria"
+  CreateShortCut "$SMPROGRAMS\Voria\Uninstall Synfig Core.lnk" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" "" "$INSTDIR\uninstall-@PACKAGE_TARNAME@.exe" 0
+  
+SectionEnd
+
+
 ;--------------------------------
 
 ; Uninstaller
@@ -119,12 +125,13 @@ Section "Uninstall"
   ; Remove files and uninstaller
   ;Delete $INSTDIR\synfig.exe
   Delete $INSTDIR\uninstall-@PACKAGE_TARNAME@.exe
-  Delete $INSTDIR\etc\synfig_modules.conf
+  Delete $INSTDIR\etc\synfig_modules.cfg
   RMDir $INSTDIR\bin
   RMDir $INSTDIR\etc
 
   ; Remove shortcuts, if any
 
+  Delete "$SMPROGRAMS\Voria\Uninstall Synfig Core.lnk"
   ; Remove directories used
   ;RMDir "$SMPROGRAMS\Example2"
   RMDir "$INSTDIR"
@@ -159,10 +166,10 @@ SubSection "Layers"
 SubSectionEnd
 SubSection "Render Targets"
 !include "@srcdir@\src\modules\mod_bmp\mod_bmp.nsh"
-;!include "@srcdir@\src\modules\mod_dv\mod_dv.nsh"
-;!include "@srcdir@\src\modules\mod_ffmpeg\mod_ffmpeg.nsh"
-;!include "@srcdir@\src\modules\mod_gif\mod_gif.nsh"
-;!include "@srcdir@\src\modules\mod_imagemagick\mod_imagemagick.nsh"
+!include "@srcdir@\src\modules\mod_dv\mod_dv.nsh"
+!include "@srcdir@\src\modules\mod_ffmpeg\mod_ffmpeg.nsh"
+!include "@srcdir@\src\modules\mod_gif\mod_gif.nsh"
+!include "@srcdir@\src\modules\mod_imagemagick\mod_imagemagick.nsh"
 !include "@srcdir@\src\modules\mod_jpeg\mod_jpeg.nsh"
 !include "@srcdir@\src\modules\mod_png\mod_png.nsh"
 !include "@srcdir@\src\modules\mod_ppm\mod_ppm.nsh"
@@ -183,10 +190,10 @@ SubSection "un.Layers"
 SubSectionEnd
 SubSection "un.Render Targets"
 !include "@srcdir@\src\modules\mod_bmp\unmod_bmp.nsh"
-;!include "@srcdir@\src\modules\mod_dv\unmod_dv.nsh"
-;!include "@srcdir@\src\modules\mod_ffmpeg\unmod_ffmpeg.nsh"
-;!include "@srcdir@\src\modules\mod_gif\unmod_gif.nsh"
-;!include "@srcdir@\src\modules\mod_imagemagick\unmod_imagemagick.nsh"
+!include "@srcdir@\src\modules\mod_dv\unmod_dv.nsh"
+!include "@srcdir@\src\modules\mod_ffmpeg\unmod_ffmpeg.nsh"
+!include "@srcdir@\src\modules\mod_gif\unmod_gif.nsh"
+!include "@srcdir@\src\modules\mod_imagemagick\unmod_imagemagick.nsh"
 !include "@srcdir@\src\modules\mod_jpeg\unmod_jpeg.nsh"
 !include "@srcdir@\src\modules\mod_png\unmod_png.nsh"
 !include "@srcdir@\src\modules\mod_ppm\unmod_ppm.nsh"