Review Board

beta

Patch for Windows build to work with OpenEXR 1.6.1 instead of OpenEXR 1.4.0a

Submitted
Updated 3 months, 3 weeks ago

Chris Norman Reviewers
pabs
None Synfig SVN 
Patch to update Windows NSIS installs to accept OpenEXR 1.6.1 instead of OpenEXR 1.4.0a.  Wildcards added for the NSIS scripts, but I can't see any way to add wildcards to the makefile.  This matches the updated scripts on the Windows Build Wiki page.  
Tested under Windows XP

Diff revision 2 (Latest)

1 2
1 2

  1. synfig-core/trunk/Makefile.am: 1 change [ 1 ]
  2. synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh: 1 change [ 1 ]
  3. synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh: 1 change [ 1 ]
  synfig-core/trunk/Makefile.am
Revision 2054 New Change
  93 

   93
   


  


  


   94


   
RMDIR=rm -fr

   94
   
RMDIR=rm -fr


  


  


   95


   

   95
   


  


  


   96


   
if WIN32_PKG	

   96
   
if WIN32_PKG	


  


  


   97


   
package: all win32inst.nsi

   97
   
package: all win32inst.nsi


  


 



 

  


    
   98


   
	cp -fu `which libHalf-4.dll` src/modules/mod_openexr/.libs/

   98
   
	cp -fu `which libHalf-6.dll` src/modules/mod_openexr/.libs/


  


  


   99


   
	cp -fu `which libIlmImf-4.dll` src/modules/mod_openexr/.libs/

   99
   
	cp -fu `which libIlmImf-6.dll` src/modules/mod_openexr/.libs/


  


  


   100


   
	cp -fu `which libIlmThread-4.dll` src/modules/mod_openexr/.libs/

   100
   
	cp -fu `which libIlmThread-6.dll` src/modules/mod_openexr/.libs/


  


  


   101


   
	cp -fu `which libIex-4.dll` src/modules/mod_openexr/.libs/

   101
   
	cp -fu `which libIex-6.dll` src/modules/mod_openexr/.libs/


  


 



 

  


    
   102


   
	makensis win32inst.nsi

   102
   
	makensis win32inst.nsi


  


  


   103


   
else

   103
   
else


  


  


   104


   
if MACOSX_PKG

   104
   
if MACOSX_PKG


  


  


   105


   
package: all pkg-info/macosx/synfig-core.info

   105
   
package: all pkg-info/macosx/synfig-core.info


  


  


   106


   
	[ -d pkg_root ] && $(RMDIR) pkg_root || true

   106
   
	[ -d pkg_root ] && $(RMDIR) pkg_root || true


  


 



 



















 
  
  
  
  
  
 
 
  

    
   synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh
  

  

   Revision 2054
   New Change
  

 




 

  


    
   1


   
; The stuff to install

   1
   
; The stuff to install


  


  


   2


   
Section "mod_openexr" Sec_mod_openexr

   2
   
Section "mod_openexr" Sec_mod_openexr


  


  


   3


   

   3
   


  


  


   4


   
;  SectionIn RO

   4
   
;  SectionIn RO


  


  


   5


   
  

   5
   
  


  


  


   6


   
  ; Set output path to the installation directory.

   6
   
  ; Set output path to the installation directory.


  


  


   7


   
  SetOutPath "$INSTDIR\lib\synfig\modules"

   7
   
  SetOutPath "$INSTDIR\lib\synfig\modules"


  


  


   8


   
  

   8
   
  


  


  


   9


   
  ; Put file there

   9
   
  ; Put file there


  


  


   10


   
  File /oname=mod_openexr.dll "src\modules\mod_openexr\.libs\libmod_openexr.dll"

   10
   
  File /oname=mod_openexr.dll "src\modules\mod_openexr\.libs\libmod_openexr.dll"


  


  


   11


   

   11
   


  


  


   12


   
  SetOutPath "$INSTDIR\bin"

   12
   
  SetOutPath "$INSTDIR\bin"


  


 



 

  


    
   13


   
  File /oname=libHalf-4.dll "src\modules\mod_openexr\.libs\libHalf-4.dll"

   13
   
  File "src\modules\mod_openexr\.libs\libHalf*.dll"


  


  


   14


   
  File /oname=libIlmImf-4.dll "src\modules\mod_openexr\.libs\libIlmImf-4.dll"

   14
   
  File "src\modules\mod_openexr\.libs\libIlmImf*.dll"


  


  


   15


   
  File /oname=libIlmThread-4.dll "src\modules\mod_openexr\.libs\libIlmThread-4.dll"

   15
   
  File "src\modules\mod_openexr\.libs\libIlmThread*.dll"


  


  


   16


   
  File /oname=libIex-4.dll "src\modules\mod_openexr\.libs\libIex-4.dll"

   16
   
  File "src\modules\mod_openexr\.libs\libIex*.dll"


  


 



 

  


    
   17


   

   17
   


  


  


   18


   
  FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a

   18
   
  FileOpen $0 $INSTDIR\etc\synfig_modules.cfg a


  


  


   19


   
  FileSeek $0 0 END

   19
   
  FileSeek $0 0 END


  


  


   20


   
  FileWrite $0 "mod_openexr"

   20
   
  FileWrite $0 "mod_openexr"


  


  


   21


   
  FileWriteByte $0 "13"

   21
   
  FileWriteByte $0 "13"


  


  


   22


   
  FileWriteByte $0 "10"

   22
   
  FileWriteByte $0 "10"


  


  


   23


   
  FileClose $0

   23
   
  FileClose $0


  


  


   24


   

   24
   


  


  


   25


   
SectionEnd

   25
   
SectionEnd


  


  


   26


   

   26
   


  


 



















 
  
  
  
  
  
 
 
  

    
   synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh
  

  

   Revision 2054
   New Change
  

 




 

  


    
   1


   
Section "un.mod_openexr"

   1
   
Section "un.mod_openexr"


  


 



 

  


    
   2


   
	Delete "$INSTDIR\bin\libIex-4.dll"

   2
   
	Delete "$INSTDIR\bin\libIex*.dll"


  


  


   3


   
	Delete "$INSTDIR\bin\libIlmImf-4.dll"

   3
   
	Delete "$INSTDIR\bin\libIlmImf*.dll"


  


  


   4


   
	Delete "$INSTDIR\bin\libIlmThread-4.dll"

   4
   
	Delete "$INSTDIR\bin\libIlmThread*.dll"


  


  


   5


   
	Delete "$INSTDIR\bin\libHalf-4.dll"

   5
   
	Delete "$INSTDIR\bin\libHalf*.dll"


  


 



 

  


    
   6


   
	Delete "$INSTDIR\lib\synfig\modules\mod_openexr.dll"

   6
   
	Delete "$INSTDIR\lib\synfig\modules\mod_openexr.dll"


  


  


   7


   
	RMDir "$INSTDIR\lib\synfig\modules"

   7
   
	RMDir "$INSTDIR\lib\synfig\modules"


  


  


   8


   
	RMDir "$INSTDIR\lib\synfig"

   8
   
	RMDir "$INSTDIR\lib\synfig"


  


  


   9


   
	RMDir "$INSTDIR\lib"

   9
   
	RMDir "$INSTDIR\lib"


  


  


   10


   
	RMDir "$INSTDIR\bin"

   10
   
	RMDir "$INSTDIR\bin"


  


  


   11


   
	RMDir "$INSTDIR"

   11
   
	RMDir "$INSTDIR"


  


  


   12


   
SectionEnd

   12
   
SectionEnd


  


  


   13


   

   13
   


  


 













    

 
  1. synfig-core/trunk/Makefile.am:
 
  
  1 change
   [
   
    
     1
    
   
]
    2. 
 

 
  2. synfig-core/trunk/src/modules/mod_openexr/mod_openexr.nsh:
 
  
  1 change
   [
   
    
     1
    
   
]
    3. 
 

 
  3. synfig-core/trunk/src/modules/mod_openexr/unmod_openexr.nsh:
 
  
  1 change
   [
   
    
     1
    
   
]
    4.