/[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 2670 by persson, Mon Aug 18 17:26:39 2014 UTC revision 3031 by persson, Sat Oct 29 15:50:23 2016 UTC
# Line 1  Line 1 
1  ; LinuxSampler Windows installer  ; LinuxSampler Windows installer
2  ;  ;
3  ; Copyright (C) 2007-2014, The LinuxSampler Developers  ; Copyright (C) 2007-2016, The LinuxSampler Developers
4  ;  ;
5  ; All-in-one Installer for all subprojects / software components of the  ; All-in-one Installer for all subprojects / software components of the
6  ; LinuxSampler Project.  ; LinuxSampler Project.
# Line 41  OutFile "linuxsampler_${RELEASE_DATE}_se Line 41  OutFile "linuxsampler_${RELEASE_DATE}_se
41    
42  ; Java Runtime Environment, needed for JSampler  ; Java Runtime Environment, needed for JSampler
43  !define JRE_VERSION "1.6"  !define JRE_VERSION "1.6"
44  ; jre-7u67-windows-i586.exe:  ; jre-8u111-windows-i586.exe:
45  !define JRE_32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=95123"  !define JRE_32_URL "http://javadl.oracle.com/webapps/download/AutoDL?BundleId=216432"
46  ; jre-7u67-windows-x64.exe:  ; jre-8u111-windows-x64.exe:
47  !define JRE_64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=95125"  !define JRE_64_URL "http://javadl.oracle.com/webapps/download/AutoDL?BundleId=216434"
48    
49  ; The default installation directory  ; The default installation directory
50  InstallDir "$PROGRAMFILES64\LinuxSampler"  InstallDir "$PROGRAMFILES64\LinuxSampler"
# Line 93  VIAddVersionKey /LANG=${LANG_ENGLISH} "P Line 93  VIAddVersionKey /LANG=${LANG_ENGLISH} "P
93  VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "http://linuxsampler.org"  VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "http://linuxsampler.org"
94  VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The LinuxSampler Project"  VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The LinuxSampler Project"
95  VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" ""  VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" ""
96  VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2003-2014 The LinuxSampler Project"  VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2003-2016 The LinuxSampler Project"
97  VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "LinuxSampler Installer (${RELEASE_DATE})"  VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "LinuxSampler Installer (${RELEASE_DATE})"
98  VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "0.0.0"  VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "0.0.0"
99    
# Line 291  Section "LinuxSampler ${LINUXSAMPLER_VER Line 291  Section "LinuxSampler ${LINUXSAMPLER_VER
291    linuxsampler64:    linuxsampler64:
292    SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"    SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"
293    File bin\64\linuxsampler.exe    File bin\64\linuxsampler.exe
294    File bin\64\liblinuxsampler-3.dll    File bin\64\liblinuxsampler-4.dll
295    File bin\64\libsqlite3-0.dll    File bin\64\libsqlite3-0.dll
296    SetOutPath $vstPluginPath64    SetOutPath $vstPluginPath64
297    File /oname=LinuxSampler64.dll bin\64\LinuxSampler.dll    File /oname=LinuxSampler64.dll bin\64\LinuxSampler.dll
# Line 305  Section "LinuxSampler ${LINUXSAMPLER_VER Line 305  Section "LinuxSampler ${LINUXSAMPLER_VER
305    linuxsampler686sse:    linuxsampler686sse:
306    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
307    File bin\686sse\linuxsampler.exe    File bin\686sse\linuxsampler.exe
308    File bin\686sse\liblinuxsampler-3.dll    File bin\686sse\liblinuxsampler-4.dll
309    File bin\686\libsqlite3-0.dll    File bin\686\libsqlite3-0.dll
310    SetOutPath $vstPluginPath    SetOutPath $vstPluginPath
311    File /oname=LinuxSampler32.dll bin\686sse\LinuxSampler.dll    File /oname=LinuxSampler32.dll bin\686sse\LinuxSampler.dll
# Line 314  Section "LinuxSampler ${LINUXSAMPLER_VER Line 314  Section "LinuxSampler ${LINUXSAMPLER_VER
314    linuxsampler686:    linuxsampler686:
315    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
316    File bin\686\linuxsampler.exe    File bin\686\linuxsampler.exe
317    File bin\686\liblinuxsampler-3.dll    File bin\686\liblinuxsampler-4.dll
318    File bin\686\libsqlite3-0.dll    File bin\686\libsqlite3-0.dll
319    SetOutPath $vstPluginPath    SetOutPath $vstPluginPath
320    File /oname=LinuxSampler32.dll bin\686\LinuxSampler.dll    File /oname=LinuxSampler32.dll bin\686\LinuxSampler.dll
# Line 343  Section "QSampler ${QSAMPLER_VERSION}" S Line 343  Section "QSampler ${QSAMPLER_VERSION}" S
343    ; Files to install    ; Files to install
344    File bin\686\qsampler.exe    File bin\686\qsampler.exe
345    File bin\686\liblscp-6.dll    File bin\686\liblscp-6.dll
346    File bin\686\QtCore4.dll    File bin\686\Qt5Core.dll
347    File bin\686\QtGui4.dll    File bin\686\Qt5Gui.dll
348    File bin\686\mingwm10.dll    File bin\686\Qt5Widgets.dll
349    File bin\686\libgcc_s_dw2-1.dll    File bin\686\libicudt57.dll
350      File bin\686\libicuin57.dll
351      File bin\686\libicuuc57.dll
352      File bin\686\libpcre16-0.dll
353      File qt.conf
354    File qsampler.ico    File qsampler.ico
355      SetOutPath $INSTDIR\plugins\platforms
356      File bin\686\plugins\platforms\qwindows.dll
357    SetOutPath $INSTDIR\share\locale    SetOutPath $INSTDIR\share\locale
358    File bin\686\share\locale\qsampler_ru.qm    File bin\686\share\locale\qsampler_*.qm
359    File bin\686\share\locale\qsampler_cs.qm    File bin\686\share\locale\qt*_*.qm
360    File bin\686\share\locale\qt_ru.qm    Call FilesCommonToQSamplerAndGigedit32
   File bin\686\share\locale\qt_cs.qm  
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
# Line 374  Section "gigedit ${GIGEDIT_VERSION}" Sec Line 397  Section "gigedit ${GIGEDIT_VERSION}" Sec
397    gigedit64:    gigedit64:
398    SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"    SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"
399    File bin\64\gigedit.exe    File bin\64\gigedit.exe
400    File bin\64\libgigedit-2.dll    File bin\64\libgigedit-3.dll
401    SetOutPath "$INSTDIR\${SUBDIR_64_BIT}\plugins"    SetOutPath "$INSTDIR\${SUBDIR_64_BIT}\plugins"
402    File bin\64\plugins\libgigeditlinuxsamplerplugin.dll    File bin\64\plugins\libgigeditlinuxsamplerplugin.dll
403    SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"    SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"
404    File bin\64\libatk-1.0-0.dll    File bin\64\libatk-1.0-0.dll
405    File bin\64\libatkmm-1.6-1.dll    File bin\64\libatkmm-1.6-1.dll
406      File bin\64\libbz2-1.dll
407    File bin\64\libcairo-2.dll    File bin\64\libcairo-2.dll
408      File bin\64\libcairo-gobject-2.dll
409    File bin\64\libcairomm-1.0-1.dll    File bin\64\libcairomm-1.0-1.dll
410      File bin\64\libepoxy-0.dll
411    File bin\64\libexpat-1.dll    File bin\64\libexpat-1.dll
412      File bin\64\libffi-6.dll
413    File bin\64\libfontconfig-1.dll    File bin\64\libfontconfig-1.dll
414    File bin\64\libfreetype-6.dll    File bin\64\libfreetype-6.dll
415    File bin\64\libgdkmm-2.4-1.dll    File bin\64\libgdkmm-3.0-1.dll
416    File bin\64\libgdk_pixbuf-2.0-0.dll    File bin\64\libgdk_pixbuf-2.0-0.dll
417    File bin\64\libgdk-win32-2.0-0.dll    File bin\64\libgdk-3-0.dll
418    File bin\64\libgio-2.0-0.dll    File bin\64\libgio-2.0-0.dll
419    File bin\64\libgiomm-2.4-1.dll    File bin\64\libgiomm-2.4-1.dll
420    File bin\64\libglib-2.0-0.dll    File bin\64\libglib-2.0-0.dll
421    File bin\64\libglibmm-2.4-1.dll    File bin\64\libglibmm-2.4-1.dll
422    File bin\64\libgmodule-2.0-0.dll    File bin\64\libgmodule-2.0-0.dll
423    File bin\64\libgobject-2.0-0.dll    File bin\64\libgobject-2.0-0.dll
424    File bin\64\libgthread-2.0-0.dll    File bin\64\libgraphite2.dll
425    File bin\64\libgtkmm-2.4-1.dll    File bin\64\libgtkmm-3.0-1.dll
426    File bin\64\libgtk-win32-2.0-0.dll    File bin\64\libgtk-3-0.dll
427      File bin\64\libharfbuzz-0.dll
428      File bin\64\libiconv-2.dll
429    File bin\64\libintl-8.dll    File bin\64\libintl-8.dll
430    File bin\64\libpango-1.0-0.dll    File bin\64\libpango-1.0-0.dll
431    File bin\64\libpangocairo-1.0-0.dll    File bin\64\libpangocairo-1.0-0.dll
432    File bin\64\libpangoft2-1.0-0.dll    File bin\64\libpangoft2-1.0-0.dll
433    File bin\64\libpangomm-1.4-1.dll    File bin\64\libpangomm-1.4-1.dll
434    File bin\64\libpangowin32-1.0-0.dll    File bin\64\libpangowin32-1.0-0.dll
435    File bin\64\libpng14-14.dll    File bin\64\libpcre-1.dll
436      File bin\64\libpixman-1-0.dll
437      File bin\64\libpng16-16.dll
438    File bin\64\libsigc-2.0-0.dll    File bin\64\libsigc-2.0-0.dll
439    File bin\64\zlib1.dll    File bin\64\zlib1.dll
   SetOutPath $INSTDIR\${SUBDIR_64_BIT}\etc\gtk-2.0  
   File bin\64\etc\gtk-2.0\gtkrc  
   SetOutPath $INSTDIR\${SUBDIR_64_BIT}\lib\gtk-2.0\2.10.0\engines  
   File bin\64\lib\gtk-2.0\2.10.0\engines\libwimp.dll  
440    SetOutPath $INSTDIR\${SUBDIR_64_BIT}\share\locale\de\LC_MESSAGES    SetOutPath $INSTDIR\${SUBDIR_64_BIT}\share\locale\de\LC_MESSAGES
441    File bin\64\share\locale\de\LC_MESSAGES\gigedit.mo    File bin\64\share\locale\de\LC_MESSAGES\gigedit.mo
   File bin\64\share\locale\de\LC_MESSAGES\gtk20.mo  
442    SetOutPath $INSTDIR\${SUBDIR_64_BIT}\share\locale\sv\LC_MESSAGES    SetOutPath $INSTDIR\${SUBDIR_64_BIT}\share\locale\sv\LC_MESSAGES
443    File bin\64\share\locale\sv\LC_MESSAGES\gigedit.mo    File bin\64\share\locale\sv\LC_MESSAGES\gigedit.mo
   File bin\64\share\locale\sv\LC_MESSAGES\gtk20.mo  
   SetOutPath $INSTDIR\${SUBDIR_64_BIT}\share\themes\MS-Windows\gtk-2.0  
   File bin\64\share\themes\MS-Windows\gtk-2.0\gtkrc  
444    
445    ; shall we install the 32 bit version as well?    ; shall we install the 32 bit version as well?
446    StrCmp $installing32BitToo "1" gigedit686 done    StrCmp $installing32BitToo "1" gigedit686 done
# Line 425  Section "gigedit ${GIGEDIT_VERSION}" Sec Line 448  Section "gigedit ${GIGEDIT_VERSION}" Sec
448    gigedit686:    gigedit686:
449    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
450    File bin\686\gigedit.exe    File bin\686\gigedit.exe
451    File bin\686\libgigedit-2.dll    File bin\686\libgigedit-3.dll
452    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}\plugins"    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}\plugins"
453    File bin\686\plugins\libgigeditlinuxsamplerplugin.dll    File bin\686\plugins\libgigeditlinuxsamplerplugin.dll
454    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
   File bin\686\intl.dll  
   File bin\686\jpeg62.dll  
455    File bin\686\libatk-1.0-0.dll    File bin\686\libatk-1.0-0.dll
456    File bin\686\libatkmm-1.6-1.dll    File bin\686\libatkmm-1.6-1.dll
457    File bin\686\libcairo-2.dll    File bin\686\libcairo-2.dll
458      File bin\686\libcairo-gobject-2.dll
459    File bin\686\libcairomm-1.0-1.dll    File bin\686\libcairomm-1.0-1.dll
460    File bin\686\libgdkmm-2.4-1.dll    File bin\686\libepoxy-0.dll
461      File bin\686\libexpat-1.dll
462      File bin\686\libffi-6.dll
463      File bin\686\libfontconfig-1.dll
464    File bin\686\libgdk_pixbuf-2.0-0.dll    File bin\686\libgdk_pixbuf-2.0-0.dll
465    File bin\686\libgdk-win32-2.0-0.dll    File bin\686\libgdk-3-0.dll
466      File bin\686\libgdkmm-3.0-1.dll
467    File bin\686\libgio-2.0-0.dll    File bin\686\libgio-2.0-0.dll
468    File bin\686\libgiomm-2.4-1.dll    File bin\686\libgiomm-2.4-1.dll
   File bin\686\libglib-2.0-0.dll  
469    File bin\686\libglibmm-2.4-1.dll    File bin\686\libglibmm-2.4-1.dll
470    File bin\686\libgmodule-2.0-0.dll    File bin\686\libgmodule-2.0-0.dll
471    File bin\686\libgobject-2.0-0.dll    File bin\686\libgobject-2.0-0.dll
472    File bin\686\libgthread-2.0-0.dll    File bin\686\libgtk-3-0.dll
473    File bin\686\libgtkmm-2.4-1.dll    File bin\686\libgtkmm-3.0-1.dll
   File bin\686\libgtk-win32-2.0-0.dll  
474    File bin\686\libpango-1.0-0.dll    File bin\686\libpango-1.0-0.dll
475    File bin\686\libpangocairo-1.0-0.dll    File bin\686\libpangocairo-1.0-0.dll
476      File bin\686\libpangoft2-1.0-0.dll
477    File bin\686\libpangomm-1.4-1.dll    File bin\686\libpangomm-1.4-1.dll
478    File bin\686\libpangowin32-1.0-0.dll    File bin\686\libpangowin32-1.0-0.dll
479    File bin\686\libpng12-0.dll    File bin\686\libpixman-1-0.dll
480    File bin\686\libsigc-2.0-0.dll    File bin\686\libsigc-2.0-0.dll
481    File bin\686\libtiff3.dll    SetOutPath $INSTDIR\${SUBDIR_32_BIT}\share
482    File bin\686\zlib1.dll    File /r bin\686\share\glib-2.0
483    SetOutPath $INSTDIR\${SUBDIR_32_BIT}\etc\gtk-2.0    File /r bin\686\share\icons
484    File bin\686\etc\gtk-2.0\gdk-pixbuf.loaders    SetOutPath $INSTDIR\${SUBDIR_32_BIT}\share\locale
485    File bin\686\etc\gtk-2.0\gtkrc    File /r bin\686\share\locale\de
486    SetOutPath $INSTDIR\${SUBDIR_32_BIT}\lib\gtk-2.0\2.10.0\engines    File /r bin\686\share\locale\sv
   File bin\686\lib\gtk-2.0\2.10.0\engines\libwimp.dll  
   SetOutPath $INSTDIR\${SUBDIR_32_BIT}\lib\gtk-2.0\2.10.0\loaders  
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-ani.dll  
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-bmp.dll  
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-gif.dll  
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-icns.dll  
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-ico.dll  
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-jpeg.dll  
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-pcx.dll  
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-png.dll  
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-pnm.dll  
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-ras.dll  
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-tga.dll  
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-tiff.dll  
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-wbmp.dll  
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-xbm.dll  
   File bin\686\lib\gtk-2.0\2.10.0\loaders\libpixbufloader-xpm.dll  
   SetOutPath $INSTDIR\${SUBDIR_32_BIT}\share\locale\de\LC_MESSAGES  
   File bin\686\share\locale\de\LC_MESSAGES\gigedit.mo  
   File bin\686\share\locale\de\LC_MESSAGES\gtk20.mo  
   SetOutPath $INSTDIR\${SUBDIR_32_BIT}\share\locale\sv\LC_MESSAGES  
   File bin\686\share\locale\sv\LC_MESSAGES\gigedit.mo  
   File bin\686\share\locale\sv\LC_MESSAGES\gtk20.mo  
   SetOutPath $INSTDIR\${SUBDIR_32_BIT}\share\themes\MS-Windows\gtk-2.0  
   File bin\686\share\themes\MS-Windows\gtk-2.0\gtkrc  
   Goto done  
487    
488    done:    done:
489  SectionEnd  SectionEnd
490    
491  Section "libgig 3.3.0" Seclibgig  Section "libgig ${LIBGIG_VERSION}" Seclibgig
492    DetailPrint "Installing libgig binaries ..."    DetailPrint "Installing libgig binaries ..."
493    ; We make this a mandatory component    ; We make this a mandatory component
494    SectionIn RO    SectionIn RO
# Line 502  Section "libgig 3.3.0" Seclibgig Line 501  Section "libgig 3.3.0" Seclibgig
501    
502    libgig64:    libgig64:
503    SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"    SetOutPath "$INSTDIR\${SUBDIR_64_BIT}"
504    File bin\64\libgig-6.dll    File bin\64\libgig-7.dll
505    File bin\64\libakai-0.dll    File bin\64\libakai-0.dll
506    File bin\64\rifftree.exe    File bin\64\rifftree.exe
507    File bin\64\dlsdump.exe    File bin\64\dlsdump.exe
# Line 510  Section "libgig 3.3.0" Seclibgig Line 509  Section "libgig 3.3.0" Seclibgig
509    File bin\64\gigextract.exe    File bin\64\gigextract.exe
510    File bin\64\gigmerge.exe    File bin\64\gigmerge.exe
511    File bin\64\gig2mono.exe    File bin\64\gig2mono.exe
512      File bin\64\gig2stereo.exe
513    File bin\64\korg2gig.exe    File bin\64\korg2gig.exe
514    File bin\64\korgdump.exe    File bin\64\korgdump.exe
515    File bin\64\akaidump.exe    File bin\64\akaidump.exe
516    File bin\64\akaiextract.exe    File bin\64\akaiextract.exe
517    File bin\64\sf2dump.exe    File bin\64\sf2dump.exe
518    ; special dependencies for the 64 bit version    File bin\64\sf2extract.exe
519    File bin\64\libgcc_s_sjlj-1.dll    File bin\64\libgcc_s_seh-1.dll
520      File bin\64\libwinpthread-1.dll  
521    File bin\64\libstdc++-6.dll    File bin\64\libstdc++-6.dll
522    
523    ; shall we install the 32 bit version as well?    ; shall we install the 32 bit version as well?
# Line 526  Section "libgig 3.3.0" Seclibgig Line 527  Section "libgig 3.3.0" Seclibgig
527    ; QSampler needs the 32 bit libgig dll    ; QSampler needs the 32 bit libgig dll
528    libgigForQsampler:    libgigForQsampler:
529    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
530    File bin\686sse\libgig-6.dll    File bin\686sse\libgig-7.dll
531    Goto done    Goto libgig32common
532    
533    libgig686sse:    libgig686sse:
534    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
535    File bin\686sse\libgig-6.dll    File bin\686sse\libgig-7.dll
536    File bin\686sse\libakai-0.dll    File bin\686sse\libakai-0.dll
537    File bin\686sse\rifftree.exe    File bin\686sse\rifftree.exe
538    File bin\686sse\dlsdump.exe    File bin\686sse\dlsdump.exe
# Line 539  Section "libgig 3.3.0" Seclibgig Line 540  Section "libgig 3.3.0" Seclibgig
540    File bin\686sse\gigextract.exe    File bin\686sse\gigextract.exe
541    File bin\686sse\gigmerge.exe    File bin\686sse\gigmerge.exe
542    File bin\686sse\gig2mono.exe    File bin\686sse\gig2mono.exe
543      File bin\686sse\gig2stereo.exe
544    File bin\686sse\korg2gig.exe    File bin\686sse\korg2gig.exe
545    File bin\686sse\korgdump.exe    File bin\686sse\korgdump.exe
546    File bin\686sse\akaidump.exe    File bin\686sse\akaidump.exe
547    File bin\686sse\akaiextract.exe    File bin\686sse\akaiextract.exe
548    File bin\686sse\sf2dump.exe    File bin\686sse\sf2dump.exe
549    Goto done    File bin\686sse\sf2extract.exe
550      Goto libgig32common
551    
552    libgig686:    libgig686:
553    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
554    File bin\686\libgig-6.dll    File bin\686\libgig-7.dll
555    File bin\686\libakai-0.dll    File bin\686\libakai-0.dll
556    File bin\686\rifftree.exe    File bin\686\rifftree.exe
557    File bin\686\dlsdump.exe    File bin\686\dlsdump.exe
# Line 556  Section "libgig 3.3.0" Seclibgig Line 559  Section "libgig 3.3.0" Seclibgig
559    File bin\686\gigextract.exe    File bin\686\gigextract.exe
560    File bin\686\gigmerge.exe    File bin\686\gigmerge.exe
561    File bin\686\gig2mono.exe    File bin\686\gig2mono.exe
562      File bin\686\gig2stereo.exe
563    File bin\686\korg2gig.exe    File bin\686\korg2gig.exe
564    File bin\686\korgdump.exe    File bin\686\korgdump.exe
565    File bin\686\akaidump.exe    File bin\686\akaidump.exe
566    File bin\686\akaiextract.exe    File bin\686\akaiextract.exe
567    File bin\686\sf2dump.exe    File bin\686\sf2dump.exe
568    Goto done    File bin\686\sf2extract.exe
569    
570      libgig32common:
571      Delete $INSTDIR\libgcc_s_dw2-1.dll ; remove old version
572      File bin\686\libgcc_s_dw2-1.dll
573      File bin\686\libwinpthread-1.dll  
574      File bin\686\libstdc++-6.dll
575      
576    done:    done:
577    
578    ; As this is a mandatory component, we misuse is for the following    ; As this is a mandatory component, we misuse is for the following
# Line 610  Section "libsndfile ${SNDFILE_VERSION}" Line 620  Section "libsndfile ${SNDFILE_VERSION}"
620    File bin\64\libogg-0.dll    File bin\64\libogg-0.dll
621    File bin\64\libvorbis-0.dll    File bin\64\libvorbis-0.dll
622    File bin\64\libvorbisenc-2.dll    File bin\64\libvorbisenc-2.dll
623      File bin\64\libspeex-1.dll
624    
625    ; shall we install the 32 bit version as well?    ; shall we install the 32 bit version as well?
626    StrCmp $installing32BitToo "1" libsndfile686 done    StrCmp $installing32BitToo "1" libsndfile686 done
# Line 621  Section "libsndfile ${SNDFILE_VERSION}" Line 632  Section "libsndfile ${SNDFILE_VERSION}"
632    File bin\686\libogg-0.dll    File bin\686\libogg-0.dll
633    File bin\686\libvorbis-0.dll    File bin\686\libvorbis-0.dll
634    File bin\686\libvorbisenc-2.dll    File bin\686\libvorbisenc-2.dll
635      File bin\686\libspeex-1.dll
636    Goto done    Goto done
637    
638    done:    done:
# Line 738  LangString DESC_SecLinuxSampler ${LANG_E Line 750  LangString DESC_SecLinuxSampler ${LANG_E
750  LangString DESC_SecJSampler ${LANG_ENGLISH} "Graphical frontend (user interface) for LinuxSampler written in Java, supporting all current features of LinuxSampler. This is the 'Fantasia' distribution of JSampler, offering a modern skin based look."  LangString DESC_SecJSampler ${LANG_ENGLISH} "Graphical frontend (user interface) for LinuxSampler written in Java, supporting all current features of LinuxSampler. This is the 'Fantasia' distribution of JSampler, offering a modern skin based look."
751  LangString DESC_SecQSampler ${LANG_ENGLISH} "Graphical light-weight frontend (user interface) for LinuxSampler written in C++, offering a fast native user interface. NOTE: QSampler doesn't support all LinuxSampler features yet!"  LangString DESC_SecQSampler ${LANG_ENGLISH} "Graphical light-weight frontend (user interface) for LinuxSampler written in C++, offering a fast native user interface. NOTE: QSampler doesn't support all LinuxSampler features yet!"
752  LangString DESC_Secgigedit ${LANG_ENGLISH} "Graphical instrument editor for Gigasampler format v2 and v3 files. Can be used stand-alone or in conjunction with LinuxSampler."  LangString DESC_Secgigedit ${LANG_ENGLISH} "Graphical instrument editor for Gigasampler format v2 and v3 files. Can be used stand-alone or in conjunction with LinuxSampler."
753  LangString DESC_Seclibgig ${LANG_ENGLISH} "C++ program library for accessing DLS (Level 1 and Level 2) and Gigasampler format (v2 and v3) files. This library is required by LinuxSampler, gigedit and QSampler."  LangString DESC_Seclibgig ${LANG_ENGLISH} "C++ program library for accessing DLS (Level 1 and Level 2) and GigaStudio/Gigasampler format (up to v4), SoundFont, AKAI and KORG files. This library is required by LinuxSampler, gigedit and QSampler."
754  LangString DESC_Seclibsndfile ${LANG_ENGLISH} "C program library for reading and writing files containing sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format), used by gigedit to import samples."  LangString DESC_Seclibsndfile ${LANG_ENGLISH} "C program library for reading and writing files containing sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format), used by gigedit to import samples."
755  LangString DESC_SecShortcuts ${LANG_ENGLISH} "Installs start menu shortcuts for all applications."  LangString DESC_SecShortcuts ${LANG_ENGLISH} "Installs start menu shortcuts for all applications."
756    
Legend:
Removed from v.2670  
changed lines
  Added in v.3031
  ViewVC Help
Powered by ViewVC