/[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 2391 by persson, Sat Jan 5 12:31:22 2013 UTC revision 2401 by persson, Mon Jan 14 18:40:22 2013 UTC
# 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-7u10-windows-i586.exe:  ; jre-7u11-windows-i586.exe:
45  !define JRE_32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=71835"  !define JRE_32_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=73141"
46  ; jre-7u10-windows-x64.exe:  ; jre-7u11-windows-x64.exe:
47  !define JRE_64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=71837"  !define JRE_64_URL "http://javadl.sun.com/webapps/download/AutoDL?BundleId=73143"
48    
49  ; The default installation directory  ; The default installation directory
50  InstallDir "$PROGRAMFILES64\LinuxSampler"  InstallDir "$PROGRAMFILES64\LinuxSampler"
# Line 512  Section "libgig 3.3.0" Seclibgig Line 512  Section "libgig 3.3.0" Seclibgig
512    File bin\64\libstdc++-6.dll    File bin\64\libstdc++-6.dll
513    
514    ; shall we install the 32 bit version as well?    ; shall we install the 32 bit version as well?
515    StrCmp $installing32BitToo "1" libgig686sse done    StrCmp $installing32BitToo "1" libgig686sse
516      StrCmp $installingQSampler "1" libgigForQsampler done
517    
518      ; QSampler needs the 32 bit libgig dll
519      libgigForQsampler:
520      SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
521      File bin\686sse\libgig-6.dll
522      Goto done
523    
524    libgig686sse:    libgig686sse:
525    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"    SetOutPath "$INSTDIR\${SUBDIR_32_BIT}"
Legend:
Removed from v.2391  
changed lines
  Added in v.2401
  ViewVC Help
Powered by ViewVC