From 85c06910386d5072c6b55de777587bc5d46ba205 Mon Sep 17 00:00:00 2001 From: pxegeek Date: Sun, 14 Sep 2008 04:46:31 +0000 Subject: [PATCH] Patch to allow Windows Builds with Open EXR 1.6.1 git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2055 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/Makefile.am | 8 ++++---- synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh | 8 ++++---- synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/synfig-core/trunk/Makefile.am b/synfig-core/trunk/Makefile.am index 6b1bbf8..890c0d3 100644 --- a/synfig-core/trunk/Makefile.am +++ b/synfig-core/trunk/Makefile.am @@ -95,10 +95,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/ + cp -fu `which libHalf-6.dll` src/modules/mod_openexr/.libs/ + cp -fu `which libIlmImf-6.dll` src/modules/mod_openexr/.libs/ + cp -fu `which libIlmThread-6.dll` src/modules/mod_openexr/.libs/ + cp -fu `which libIex-6.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 b11034b..512f643 100644 --- a/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh +++ b/synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh @@ -10,10 +10,10 @@ Section "mod_openexr" Sec_mod_openexr File /oname=mod_openexr.dll "src\modules\mod_openexr\.libs\libmod_openexr.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" + File "src\modules\mod_openexr\.libs\libHalf*.dll" + File "src\modules\mod_openexr\.libs\libIlmImf*.dll" + File "src\modules\mod_openexr\.libs\libIlmThread*.dll" + File "src\modules\mod_openexr\.libs\libIex*.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 18db45a..e4b15de 100644 --- 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,8 @@ 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\bin\libIex*.dll" + Delete "$INSTDIR\bin\libIlmImf*.dll" + Delete "$INSTDIR\bin\libIlmThread*.dll" + Delete "$INSTDIR\bin\libHalf*.dll" Delete "$INSTDIR\lib\synfig\modules\mod_openexr.dll" RMDir "$INSTDIR\lib\synfig\modules" RMDir "$INSTDIR\lib\synfig" -- 2.7.4