Combine the check for libavcodec and libavformat into a single search. Only if they...

[synfig.git] / synfig-core / trunk / win32inst.nsi.in

diff --git a/synfig-core/trunk/win32inst.nsi.in b/synfig-core/trunk/win32inst.nsi.in
index 28d3d95..db4a2df 100644 (file)
--- a/synfig-core/trunk/win32inst.nsi.in
+++ b/synfig-core/trunk/win32inst.nsi.in
@@ -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
@@ -170,10 +171,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"
@@ -194,10 +195,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"