/[svn]/misc/trunk/win32_installer/linuxsampler_all.nsi
ViewVC logotype

Diff of /misc/trunk/win32_installer/linuxsampler_all.nsi

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3027 by persson, Mon Oct 24 20:22:41 2016 UTC revision 3029 by persson, Wed Oct 26 17:46:12 2016 UTC
# Line 346  Section "QSampler ${QSAMPLER_VERSION}" S Line 346  Section "QSampler ${QSAMPLER_VERSION}" S
346    File bin\686\Qt5Core.dll    File bin\686\Qt5Core.dll
347    File bin\686\Qt5Gui.dll    File bin\686\Qt5Gui.dll
348    File bin\686\Qt5Widgets.dll    File bin\686\Qt5Widgets.dll
   File bin\686\libbz2-1.dll  
   File bin\686\libfreetype-6.dll  
   Delete $INSTDIR\${SUBDIR_32_BIT}\libglib-2.0-0.dll ; remove old version  
   File bin\686\libglib-2.0-0.dll  
   File bin\686\libgraphite2.dll  
   File bin\686\libharfbuzz-0.dll  
   File bin\686\libiconv-2.dll  
349    File bin\686\libicudt57.dll    File bin\686\libicudt57.dll
350    File bin\686\libicuin57.dll    File bin\686\libicuin57.dll
351    File bin\686\libicuuc57.dll    File bin\686\libicuuc57.dll
   File bin\686\libintl-8.dll  
   File bin\686\liblscp-6.dll  
   File bin\686\libpcre-1.dll  
352    File bin\686\libpcre16-0.dll    File bin\686\libpcre16-0.dll
   File bin\686\libpng16-16.dll  
   Delete $INSTDIR\${SUBDIR_32_BIT}\zlib1.dll ; remove old version  
   File bin\686\zlib1.dll  
353    File qt.conf    File qt.conf
354    File qsampler.ico    File qsampler.ico
355    SetOutPath $INSTDIR\plugins\platforms    SetOutPath $INSTDIR\plugins\platforms
# Line 370  Section "QSampler ${QSAMPLER_VERSION}" S Line 357  Section "QSampler ${QSAMPLER_VERSION}" S
357    SetOutPath $INSTDIR\share\locale    SetOutPath $INSTDIR\share\locale
358    File bin\686\share\locale\qsampler_*.qm    File bin\686\share\locale\qsampler_*.qm
359    File bin\686\share\locale\qt*_*.qm    File bin\686\share\locale\qt*_*.qm
360      Call FilesCommonToQSamplerAndGigedit32
361  SectionEnd  SectionEnd
362    
363    Function FilesCommonToQSamplerAndGigedit32
364      SetOutPath $INSTDIR
365      File bin\686\libbz2-1.dll
366      File bin\686\libfreetype-6.dll
367      Delete $INSTDIR\${SUBDIR_32_BIT}\libglib-2.0-0.dll ; remove old version
368      File bin\686\libglib-2.0-0.dll
369      File bin\686\libgraphite2.dll
370      File bin\686\libharfbuzz-0.dll
371      File bin\686\libiconv-2.dll
372      File bin\686\libintl-8.dll
373      File bin\686\libpcre-1.dll
374      File bin\686\libpng16-16.dll
375      Delete $INSTDIR\${SUBDIR_32_BIT}\zlib1.dll ; remove old version
376      File bin\686\zlib1.dll
377    FunctionEnd
378    
379  Section "gigedit ${GIGEDIT_VERSION}" Secgigedit  Section "gigedit ${GIGEDIT_VERSION}" Secgigedit
380    DetailPrint "Installing gigedit binaries ..."    DetailPrint "Installing gigedit binaries ..."
381    StrCpy $installinggigedit "1"    StrCpy $installinggigedit "1"
382    
383    ; make sure gtkmm is installed    StrCmp $installingQSampler "1" commonDone
384    ; (commented out for now, since we include gtk(mm) DLLs with this    StrCmp $binType BIN_TYPE_64BIT 0 common
385    ; installer, so no check and no download necessary ATM)    StrCmp $installing32BitToo "0" commonDone
386    ;Call CheckForGtkmm    common:
387      Call FilesCommonToQSamplerAndGigedit32
388      commonDone:
389      
390    StrCmp $binType BIN_TYPE_64BIT gigedit64    StrCmp $binType BIN_TYPE_64BIT gigedit64
391    ; I think we don't need a SSE optimized 32 bit binary for gigedit, one 64bit and one simple 32 bit version should be sufficient    ; I think we don't need a SSE optimized 32 bit binary for gigedit, one 64bit and one simple 32 bit version should be sufficient
392    ;StrCmp $binType BIN_TYPE_686SSE gigedit686sse    ;StrCmp $binType BIN_TYPE_686SSE gigedit686sse
Legend:
Removed from v.3027  
changed lines
  Added in v.3029
  ViewVC Help
Powered by ViewVC