diff --git a/nsis/ApplyExeProps.nsh b/nsis/ApplyExeProps.nsh index ba17a40db1..df1e8ca573 100644 --- a/nsis/ApplyExeProps.nsh +++ b/nsis/ApplyExeProps.nsh @@ -6,7 +6,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APP_NAME}" ;VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "A test comment" -VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2011 PCSX2 Dev Team" +VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2012 PCSX2 Dev Team" VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Installs PCSX2, a Playstation 2 Emulator for the PC." VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${APP_VERSION}.${SVNREV_PACKAGE}" diff --git a/nsis/nsis_instructions.txt b/nsis/nsis_instructions.txt index 4bb8f1cc54..de21319786 100644 --- a/nsis/nsis_instructions.txt +++ b/nsis/nsis_instructions.txt @@ -2,8 +2,9 @@ PCSX2 NSIS Installer Instructions ------------------------------------- - * Install NSIS (tested with 2.46) + * Install NSIS (tested with 2.46), make sure to include the "Modern User Interface" * Install NSIS Script: Advanced Uninstall Log (you can find it on NSIS wiki) + ( Currently at http://nsis.sourceforge.net/Advanced_Uninstall_Log_NSIS_Header ) /******* -- Not needed as we now build using VS2010 --: @@ -12,13 +13,13 @@ *******/ * Download the Visual C++ 2010 SP1 Redistributable and save it to this nsis/ folder. - vcredist_2010_sp1_x86.exe ( http://download.microsoft.com/download/C/6/D/C6D0FD4E-9E53-4897-9B91-836EBA2AACD3/vcredist_x86.exe ) - - [the files can be obtained from Microsoft's website, just google for them] + ( http://download.microsoft.com/download/C/6/D/C6D0FD4E-9E53-4897-9B91-836EBA2AACD3/vcredist_x86.exe ) + Rename the download to "vcredist_2010_sp1_x86.exe". * Download the DirectX Web Installer (dxwebsetup.exe) from Microsoft's website and save it to - this nsis/ folder. (currently required, might be made optional later). No name change is - required. ( http://download.microsoft.com/download/1/7/1/1718CCC4-6315-4D8E-9543-8E28A4E18C4C/dxwebsetup.exe ) + this nsis/ folder. (currently required, might be made optional later). + ( http://download.microsoft.com/download/1/7/1/1718CCC4-6315-4D8E-9543-8E28A4E18C4C/dxwebsetup.exe ) + No name change is required. * Load the PCSX2 Suite solution and rebuild all in the following targets: * Release SSE2 diff --git a/nsis/pcsx2_full_install.nsi b/nsis/pcsx2_full_install.nsi index 43922acb3c..55643f37ea 100644 --- a/nsis/pcsx2_full_install.nsi +++ b/nsis/pcsx2_full_install.nsi @@ -2,7 +2,7 @@ ; PCSX2 Full/Complete Install Package! ; (a NSIS installer script) ; -; Copyright 2009-2011 PCSX2 Dev Team +; Copyright 2009-2012 PCSX2 Dev Team ; !ifndef INC_CRT_2008 @@ -83,14 +83,14 @@ SectionEnd ; ----------------------------------------------------------------------- ; MSVC Redistributable - required if the user does not already have it ; Note: if your NSIS generates an error here it means you need to download the latest -; visual studio redist package from microsoft. Any redist 2008/SP1 or newer will do. +; visual studio redist package from microsoft. ; ; IMPORTANT: Online references for how to detect the presence of the VS2008 redists LIE. ; None of the methods are reliable, because the registry keys placed by the MSI installer ; vary depending on operating system *and* MSI installer version (youch). ; !if ${INC_CRT_2008} > 0 -Section "Microsoft Visual C++ 2008 SP1 Redist (required)" SEC_CRT2008 +Section "Microsoft Visual C++ 2008 SP1 Redist" SEC_CRT2008 SectionIn RO @@ -109,7 +109,7 @@ SectionEnd !endif !if ${INC_CRT_2010} > 0 -Section "Microsoft Visual C++ 2010 SP1 Redist (recommended)" SEC_CRT2010 +Section "Microsoft Visual C++ 2010 SP1 Redist" SEC_CRT2010 ;SectionIn RO @@ -146,7 +146,7 @@ SectionEnd ; This section could be optional, but why not? It's pretty painless to double-check that ; all the libraries are up-to-date. ; -Section "DirectX Web Setup (recommended)" SEC_DIRECTX +Section "DirectX Web Setup" SEC_DIRECTX ;SectionIn RO @@ -168,7 +168,7 @@ LangString DESC_STARTMENU ${LANG_ENGLISH} "Adds shortcuts for PCSX2 to the star LangString DESC_DESKTOP ${LANG_ENGLISH} "Adds a shortcut for PCSX2 to the desktop (all users)." LangString DESC_CRT2008 ${LANG_ENGLISH} "Required by the PCSX2 binaries packaged in this installer." -LangString DESC_CRT2010 ${LANG_ENGLISH} "This may be used by future PCSX2 plugins and updates, but is not (yet) necessary." +LangString DESC_CRT2010 ${LANG_ENGLISH} "Required by the PCSX2 binaries packaged in this installer." LangString DESC_DIRECTX ${LANG_ENGLISH} "Only uncheck this if you are quite certain your Direct3D runtimes are up to date." !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN diff --git a/nsis/pcsx2_web_install.nsi b/nsis/pcsx2_web_install.nsi index 0981f5ce5b..f3a9fb6df2 100644 --- a/nsis/pcsx2_web_install.nsi +++ b/nsis/pcsx2_web_install.nsi @@ -2,7 +2,7 @@ ; PCSX2 Web-based Install Package! ; (a NSIS installer script) ; -; Copyright 2009-2011 PCSX2 Dev Team +; Copyright 2009-2012 PCSX2 Dev Team ; ; The installer generated by this script will download all relevant components for ; PCSX2 from a variety of mirror hosts. Packages are only downloaded on an as-needed @@ -100,14 +100,14 @@ SectionEnd ; ----------------------------------------------------------------------- ; MSVC Redistributable - required if the user does not already have it ; Note: if your NSIS generates an error here it means you need to download the latest -; visual studio redist package from microsoft. Any redist 2008/SP1 or newer will do. +; visual studio redist package from microsoft. ; ; IMPORTANT: Online references for how to detect the presence of the VS2008 redists LIE. ; None of the methods are reliable, because the registry keys placed by the MSI installer ; vary depending on operating system *and* MSI installer version (youch). ; -!if 0 ; Not required anymore, we're compiling with vs2010 (there's anotehr commented out section below. search "SEC_CRT2008"). -Section "Microsoft Visual C++ 2008 SP1 Redist (required)" SEC_CRT2008 +!if 0 ; Not required anymore, we're compiling with vs2010 (there's another commented out section below. search "SEC_CRT2008"). +Section "Microsoft Visual C++ 2008 SP1 Redist" SEC_CRT2008 ;SectionIn RO @@ -146,7 +146,7 @@ done: SectionEnd !endif -Section "Microsoft Visual C++ 2010 SP1 Redist (required)" SEC_CRT2010 +Section "Microsoft Visual C++ 2010 SP1 Redist" SEC_CRT2010 ; Make this required on the web installer, since it has a fully reliable check to ; see if it needs to be downloaded and installed or not. @@ -205,7 +205,7 @@ SectionEnd ; This section could be optional, but why not? It's pretty painless to double-check that ; all the libraries are up-to-date. ; -Section "DirectX Web Setup (recommended)" SEC_DIRECTX +Section "DirectX Web Setup" SEC_DIRECTX ;SectionIn RO