From 8a08add47639afc637a88f6304019fa285210778 Mon Sep 17 00:00:00 2001 From: ramapcsx2 Date: Thu, 7 Apr 2011 19:52:47 +0000 Subject: [PATCH] Installer changes to support the new docs. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4548 96395faa-99c1-11dd-bbfe-3dabce05a288 --- nsis/SectionCoreReqs.nsh | 8 ++------ nsis/SharedBase.nsh | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/nsis/SectionCoreReqs.nsh b/nsis/SectionCoreReqs.nsh index f4cb846e36..c0b45dcadd 100644 --- a/nsis/SectionCoreReqs.nsh +++ b/nsis/SectionCoreReqs.nsh @@ -27,13 +27,12 @@ ; (Binaries, shared DLLs, null plugins, game database, languages, etc) ; Note that v3 pthreads is compatible with v4 pthreads, so we just copy v4 over both - ; filenames. This allows many older plugin versions to continue to work. (note that - ; v3 will be removed for 0.9.8). + ; filenames. This allows many older plugin versions to continue to work. File ..\bin\w32pthreads.v4.dll File ..\bin\SDL.dll ; See above comment. - ; File /oname=w32pthreads.v3.dll ..\bin\w32pthreads.v4.dll + File /oname=w32pthreads.v3.dll ..\bin\w32pthreads.v4.dll File ..\bin\GameIndex.dbf !insertmacro UNINSTALL.LOG_CLOSE_INSTALL @@ -62,9 +61,6 @@ File ..\bin\Plugins\CDVDnull.dll !insertmacro UNINSTALL.LOG_CLOSE_INSTALL - ; In 0.9.7 there is only English, so including the other mo files (for now) is pointless. - ; This code will be re-enabled when the new GUI is translated. - !if ${INC_LANGS} > 0 SetOutPath $INSTDIR\Langs !insertmacro UNINSTALL.LOG_OPEN_INSTALL diff --git a/nsis/SharedBase.nsh b/nsis/SharedBase.nsh index d7dec3cde1..92ff5c3ede 100644 --- a/nsis/SharedBase.nsh +++ b/nsis/SharedBase.nsh @@ -74,8 +74,8 @@ InstallDir "$PROGRAMFILES\PCSX2 ${APP_VERSION}" !define APP_EXE "$INSTDIR\${APP_FILENAME}.exe" !define INSTDIR_REG_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_FILENAME}" -!define PCSX2_README "pcsx2 readme ${APP_VERSION}.doc" -!define PCSX2_FAQ "pcsx2 FAQ ${APP_VERSION}.pdf" +!define PCSX2_README "PCSX2_Readme_${APP_VERSION}.pdf" +!define PCSX2_FAQ "PCSX2_FAQ_${APP_VERSION}.pdf" Var DirectXSetupError