Patch 1714885: Windows version can be built with OpenEXR support now. This patch...

git-svn-id: http://svn.voria.com/code@483 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-core/trunk/Makefile.am b/synfig-core/trunk/Makefile.am
index 8e47e77..4ce94ba 100644 (file)
--- a/synfig-core/trunk/Makefile.am
+++ b/synfig-core/trunk/Makefile.am
@@ -97,6 +97,10 @@ RMDIR=rm -fr
 
 if WIN32_PKG   
 package: all win32inst.nsi
+       cp -fu `which libHalf-4.dll` src/modules/mod_openexr/.libs/
+       cp -fu `which libIlmImf-4.dll` src/modules/mod_openexr/.libs/
+       cp -fu `which libIlmThread-4.dll` src/modules/mod_openexr/.libs/
+       cp -fu `which libIex-4.dll` src/modules/mod_openexr/.libs/
        makensis win32inst.nsi
 else
 if MACOSX_PKG

diff --git a/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh b/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh
index 59eca60..ce43164 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh
+++ b/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh
@@ -9,6 +9,11 @@ Section "mod_openexr" Sec_mod_openexr
   ; Put file there
   File /oname=mod_openexr.dll "src\modules\mod_openexr\.libs\libmod_openexr-0.dll"
 
+  SetOutPath "$INSTDIR\bin"
+  File /oname=libHalf-4.dll "src\modules\mod_openexr\.libs\libHalf-4.dll"
+  File /oname=libIlmImf-4.dll "src\modules\mod_openexr\.libs\libIlmImf-4.dll"
+  File /oname=libIlmThread-4.dll "src\modules\mod_openexr\.libs\libIlmThread-4.dll"
+  File /oname=libIex-4.dll "src\modules\mod_openexr\.libs\libIex-4.dll"
 
   FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a
   FileSeek $0 0 END

diff --git a/synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh b/synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh
index d0aa1c6..18db45a 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh
+++ b/synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh
@@ -1,8 +1,13 @@
 Section "un.mod_openexr"
+       Delete "$INSTDIR\bin\libIex-4.dll"
+       Delete "$INSTDIR\bin\libIlmImf-4.dll"
+       Delete "$INSTDIR\bin\libIlmThread-4.dll"
+       Delete "$INSTDIR\bin\libHalf-4.dll"
        Delete "$INSTDIR\lib\synfig\modules\mod_openexr.dll"
        RMDir "$INSTDIR\lib\synfig\modules"
        RMDir "$INSTDIR\lib\synfig"
        RMDir "$INSTDIR\lib"
+       RMDir "$INSTDIR\bin"
        RMDir "$INSTDIR"
 SectionEnd
 

diff --git a/synfig-core/trunk/win32inst.nsi.in b/synfig-core/trunk/win32inst.nsi.in
index 886938b..dea6413 100644 (file)
--- a/synfig-core/trunk/win32inst.nsi.in
+++ b/synfig-core/trunk/win32inst.nsi.in
@@ -162,6 +162,7 @@ SectionGroup "Render Targets"
 !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_openexr\mod_openexr.nsh"
 !include "@srcdir@\src\modules\mod_png\mod_png.nsh"
 !include "@srcdir@\src\modules\mod_ppm\mod_ppm.nsh"
 !include "@srcdir@\src\modules\mod_yuv420p\mod_yuv420p.nsh"
@@ -185,6 +186,7 @@ SectionGroup "un.Render Targets"
 !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_openexr\unmod_openexr.nsh"
 !include "@srcdir@\src\modules\mod_png\unmod_png.nsh"
 !include "@srcdir@\src\modules\mod_ppm\unmod_ppm.nsh"
 !include "@srcdir@\src\modules\mod_yuv420p\unmod_yuv420p.nsh"