round of nsis fixes

This commit is contained in:
ramapcsx2 2015-12-20 02:55:17 +01:00
parent 58aaea6277
commit 279fc2ac79
7 changed files with 12 additions and 6 deletions

View File

@ -6,8 +6,8 @@
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${APP_NAME}"
;VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "A test comment"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2014 PCSX2 Dev Team"
VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2015 PCSX2 Dev Team"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Installs PCSX2, a Playstation 2 Emulator for the PC."
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${APP_VERSION}"
VIProductVersion "${APP_VERSION}"
VIProductVersion "${APP_VERSION}.0"

View File

@ -45,6 +45,11 @@
SetOutPath "$INSTDIR\Docs"
!insertmacro UNINSTALL.LOG_OPEN_INSTALL
File ..\bin\docs\*
!insertmacro UNINSTALL.LOG_CLOSE_INSTALL
SetOutPath "$INSTDIR\Shaders"
!insertmacro UNINSTALL.LOG_OPEN_INSTALL
File ..\bin\shaders\*
!insertmacro UNINSTALL.LOG_CLOSE_INSTALL
SetOutPath "$INSTDIR\Plugins"

View File

@ -23,6 +23,7 @@ Section "Un.Program and Plugins ${APP_NAME}"
!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\Plugins"
!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\Docs"
!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\Cheats"
!insertmacro UNINSTALL.LOG_UNINSTALL "$INSTDIR\Shaders"
; Remove files and registry key that store PCSX2 paths configurations
SetShellVarContext current
Delete $DOCUMENTS\PCSX2\inis\PCSX2_ui.ini
@ -42,6 +43,7 @@ Section /o "Un.User files (Memory Cards, Savestates, etc)"
SetShellVarContext current
RMDir /r "$DOCUMENTS\PCSX2\Cheats_ws\"
RMDir /r "$DOCUMENTS\PCSX2\cheats\"
RMDir /r "$DOCUMENTS\PCSX2\inis\"
RMDir /r "$DOCUMENTS\PCSX2\logs\"
RMDir /r "$DOCUMENTS\PCSX2\memcards\"

View File

@ -30,7 +30,7 @@
; uninstall folders.
!ifndef APP_VERSION
!define APP_VERSION "1.2.1.0"
!define APP_VERSION "1.4.0"
!endif
!define APP_NAME "PCSX2 ${APP_VERSION}"

View File

@ -33,6 +33,7 @@
* Release SSSE3 (only needed if packaging plugins)
* Release SSE4 (only needed if packaging plugins)
* Release AVX (only needed if packaging plugins)
* Release AVX2 (only needed if packaging plugins)
* Devel (optional) /* not enabled in the installer either, so need to do that as well */
You may selectively unload plugins you do not wish to package prior to running the NSIS
@ -50,7 +51,7 @@ The installer will include plugins only if they are present. If you do not buil
remove some (or all) plugins before running the nsis script, only PCSX2 and whatever remaining
plugins will be packaged.
GSdx SSE2, SSSE3, SSE4 and AVX versions are all included into the installer *if* they are present.
GSdx SSE2, SSSE3, SSE4 and AVX/AVX2 versions are all included into the installer *if* they are present.
You will need to follow the above instructions and compile all release targets to get all the
GSdx DLLs.

View File

@ -80,7 +80,6 @@ Section "!${APP_NAME} (required)" SEC_CORE
File ..\bin\Plugins\cdvdGigaherz.dll
File /nonfatal /oname=lilypad.dll ..\bin\Plugins\lilypad.dll
File ..\bin\Plugins\PadSSSPSX.dll
File /nonfatal ..\bin\Plugins\padPokopom.dll
!insertmacro UNINSTALL.LOG_CLOSE_INSTALL

View File

@ -67,7 +67,6 @@ Section "!${APP_NAME} (required)" SEC_CORE
File ..\bin\Plugins\cdvdGigaherz.dll
File /nonfatal /oname=lilypad.dll ..\bin\Plugins\lilypad.dll
File ..\bin\Plugins\PadSSSPSX.dll
File /nonfatal ..\bin\Plugins\padPokopom.dll
!insertmacro UNINSTALL.LOG_CLOSE_INSTALL