mirrors/dolphin-emulator
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-24 22:34:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update nsis installer and some cleanup. Note: I'm not sure if the installer yet allows for mutliple revisions installed side-by-side, but that is the intention. Also, I need to figure out how to do subsections and some trickies in nsis.

Browse source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1842 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2009-01-09 16:04:28 +00:00
parent 726fd4baf0
commit 7ff3d76b0a
9 changed files with 362 additions and 185 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Installer/Dolphin.ini
View file

@ -1,4 +0,0 @@
[Default]
GFXPlugin = Plugins\Plugin_VideoOGL.dll
DSPPlugin = Plugins\Plugin_DSP_HLE.dll
PadPlugin = Plugins\Plugin_PadSimple.dll

11
Installer/GetSVNRev.nsi Normal file
View file

@ -0,0 +1,11 @@
OutFile "GetSVNRev.exe"
SilentInstall silent
Section
; Create template for SubWCRev
FileOpen $R0 "svnrev_template.txt" w
FileWrite $R0 '!define PRODUCT_VERSION "$$WCREV$$"'
FileClose $R0
; Make a file with only rev # in it
Exec "..\Source\Core\Common\SubWCRev.exe ..\ svnrev_template.txt svnrev.txt"
SectionEnd

256
Installer/Installer_win32.nsi
View file

@ -1,105 +1,180 @@
!define BASE_PATH "..\Binary\win32" !system "GetSVNRev.exe" ; ATTENTION: This MUST be run before this script
!define SETUP_NAME "DolphinSetup_32bit_14b" !include "svnrev.txt" ; !defines PRODUCT_VERSION
!define BASE_DIR "..\Binary\win32"
; Script generated by the HM NIS Edit Script Wizard.
; HM NIS Edit Wizard helper defines ; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Dolphin" !define PRODUCT_NAME "Dolphin"
!define PRODUCT_VERSION "1.4b" !define PRODUCT_PUBLISHER "Dolphin Team"
!define PRODUCT_PUBLISHER "Dolphin DevTeam"
!define PRODUCT_WEB_SITE "http://www.dolphin-emu.com" !define PRODUCT_WEB_SITE "http://www.dolphin-emu.com"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\DolphinWx.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM" !define PRODUCT_UNINST_ROOT_KEY "HKLM"
SetCompressor lzma
; MUI 1.67 compatible ------ ; MUI 1.67 compatible ------
!include "MUI.nsh" !include "MUI.nsh"
; MUI Settings ; MUI Settings
!define MUI_ABORTWARNING !define MUI_ABORTWARNING
!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico" !define MUI_ICON "Dolphin.ico"
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
!define MUI_WELCOMEFINISHPAGE_BITMAP "wizard.bmp"
; Welcome page ; Language Selection Dialog Settings
!insertmacro MUI_PAGE_WELCOME !define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
; License page ; License page
!insertmacro MUI_PAGE_LICENSE "Licence.txt" !insertmacro MUI_PAGE_LICENSE "Licence.txt"
; Components page
!insertmacro MUI_PAGE_COMPONENTS
; Directory page ; Directory page
!insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_DIRECTORY
; Instfiles page ; Instfiles page
!insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_INSTFILES
; Finish page ; Finish page
!define MUI_FINISHPAGE_RUN "$INSTDIR\DolphinWx.exe" ; We launch the desktop shortcut to set the working dir
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_TEXT "Start $(^Name)"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchDolphin"
!insertmacro MUI_PAGE_FINISH !insertmacro MUI_PAGE_FINISH
; Uninstaller pages ; Uninstaller pages
!insertmacro MUI_UNPAGE_INSTFILES !insertmacro MUI_UNPAGE_INSTFILES
; Language files ; Language files
!insertmacro MUI_LANGUAGE "Afrikaans"
!insertmacro MUI_LANGUAGE "Albanian"
!insertmacro MUI_LANGUAGE "Arabic"
!insertmacro MUI_LANGUAGE "Basque"
!insertmacro MUI_LANGUAGE "Belarusian"
!insertmacro MUI_LANGUAGE "Bosnian"
!insertmacro MUI_LANGUAGE "Breton"
!insertmacro MUI_LANGUAGE "Bulgarian"
!insertmacro MUI_LANGUAGE "Catalan"
!insertmacro MUI_LANGUAGE "Croatian"
!insertmacro MUI_LANGUAGE "Czech"
!insertmacro MUI_LANGUAGE "Danish"
!insertmacro MUI_LANGUAGE "Dutch"
!insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "English"
!insertmacro MUI_LANGUAGE "Estonian"
!insertmacro MUI_LANGUAGE "Farsi"
!insertmacro MUI_LANGUAGE "Finnish"
!insertmacro MUI_LANGUAGE "French"
!insertmacro MUI_LANGUAGE "Galician"
!insertmacro MUI_LANGUAGE "German"
!insertmacro MUI_LANGUAGE "Greek"
!insertmacro MUI_LANGUAGE "Hebrew"
!insertmacro MUI_LANGUAGE "Hungarian"
!insertmacro MUI_LANGUAGE "Icelandic"
!insertmacro MUI_LANGUAGE "Indonesian"
!insertmacro MUI_LANGUAGE "Irish"
!insertmacro MUI_LANGUAGE "Italian"
!insertmacro MUI_LANGUAGE "Japanese"
!insertmacro MUI_LANGUAGE "Korean"
!insertmacro MUI_LANGUAGE "Kurdish"
!insertmacro MUI_LANGUAGE "Latvian"
!insertmacro MUI_LANGUAGE "Lithuanian"
!insertmacro MUI_LANGUAGE "Luxembourgish"
!insertmacro MUI_LANGUAGE "Macedonian"
!insertmacro MUI_LANGUAGE "Malay"
!insertmacro MUI_LANGUAGE "Mongolian"
!insertmacro MUI_LANGUAGE "Norwegian"
!insertmacro MUI_LANGUAGE "NorwegianNynorsk"
!insertmacro MUI_LANGUAGE "Polish"
!insertmacro MUI_LANGUAGE "Portuguese"
!insertmacro MUI_LANGUAGE "PortugueseBR"
!insertmacro MUI_LANGUAGE "Romanian"
!insertmacro MUI_LANGUAGE "Russian"
!insertmacro MUI_LANGUAGE "Serbian"
!insertmacro MUI_LANGUAGE "SerbianLatin"
!insertmacro MUI_LANGUAGE "SimpChinese"
!insertmacro MUI_LANGUAGE "Slovak"
!insertmacro MUI_LANGUAGE "Slovenian"
!insertmacro MUI_LANGUAGE "Spanish"
!insertmacro MUI_LANGUAGE "SpanishInternational"
!insertmacro MUI_LANGUAGE "Swedish"
!insertmacro MUI_LANGUAGE "Thai"
!insertmacro MUI_LANGUAGE "TradChinese"
!insertmacro MUI_LANGUAGE "Turkish"
!insertmacro MUI_LANGUAGE "Ukrainian"
!insertmacro MUI_LANGUAGE "Uzbek"
!insertmacro MUI_LANGUAGE "Welsh"
; Reserve files
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
; MUI end ------ ; MUI end ------
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile "${SETUP_NAME}.exe" !define UN_NAME "Uninstall $(^Name)"
InstallDir "$PROGRAMFILES32\Dolphin" OutFile "Dolphin_Installer_win32.exe"
InstallDir "$PROGRAMFILES\$(^Name)"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
ShowInstDetails show ShowInstDetails show
ShowUnInstDetails show ShowUnInstDetails show
Section "Hauptgruppe" SEC01 Function .onInit
SetOverwrite try !insertmacro MUI_LANGDLL_DISPLAY
FunctionEnd
; --- copy executable
SetOutPath "$INSTDIR" Section "Base" SEC01
File "${BASE_PATH}\cg.dll" SetShellVarContext all
File "${BASE_PATH}\cgGL.dll" ; Dolphin exe and dlls
File "${BASE_PATH}\DolphinWx.exe" ; TODO: cg is only for OGL, SDL is only for nJoy
File "Dolphin.ini" ; TODO: Make a nice subsection-ized display
; --- copy plugins
SetOutPath "$INSTDIR\Plugins"
File "${BASE_PATH}\Plugins\Plugin_DSP.dll"
File "${BASE_PATH}\Plugins\Plugin_PadDX9.dll"
File "${BASE_PATH}\Plugins\Plugin_PadSimple.dll"
File "${BASE_PATH}\Plugins\Plugin_VideoDX9.dll"
File "${BASE_PATH}\Plugins\Plugin_VideoOGL.dll"
; --- copy help
; SetOutPath "$INSTDIR\Help"
; File "${BASE_PATH}\Help\Dolphin.chm"
; --- copy data directory
SetOutPath "$INSTDIR\Data"
File "${BASE_PATH}\Data\*.*"
; --- create data directories and copy IPLs
SetOutPath "$INSTDIR\Data_EUR"
File "${BASE_PATH}\Data_EUR\SRAM.raw"
SetOutPath "$INSTDIR\Data_JAP"
File "${BASE_PATH}\Data_JAP\SRAM.raw"
SetOutPath "$INSTDIR\Data_USA"
File "${BASE_PATH}\Data_USA\SRAM.raw"
; --- copy patches directory
SetOutPath "$INSTDIR\Patches"
File "${BASE_PATH}\Patches\*.*"
; -- create shortcuts
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
SetOverwrite ifnewer
File "${BASE_DIR}\DolphinWx.exe"
File "..\Externals\Cg\cg.dll"
File "..\Externals\Cg\cgGL.dll"
File "..\Externals\WiiUse\Win32\wiiuse.dll"
File "..\Externals\SDL\win32\SDL.dll"
; This needs to be done after DolphinWx.exe is copied
CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}" CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
CreateShortCut "$SMPROGRAMS\Dolphin\${PRODUCT_NAME}.lnk" "$INSTDIR\DolphinWx.exe" CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\$(^Name).lnk" "$INSTDIR\DolphinWx.exe"
CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\DolphinWx.exe" CreateShortCut "$DESKTOP\$(^Name).lnk" "$INSTDIR\DolphinWx.exe"
; Plugins
SetOutPath "$INSTDIR\Plugins"
SetOverwrite ifnewer
File "${BASE_DIR}\Plugins\Plugin_DSP_HLE.dll"
File "${BASE_DIR}\Plugins\Plugin_DSP_LLE.dll"
File "${BASE_DIR}\Plugins\Plugin_DSP_NULL.dll"
File "${BASE_DIR}\Plugins\Plugin_nJoy_SDL.dll"
File "${BASE_DIR}\Plugins\Plugin_nJoy_SDL_Test.dll"
File "${BASE_DIR}\Plugins\Plugin_PadSimple.dll"
File "${BASE_DIR}\Plugins\Plugin_VideoDX9.dll"
File "${BASE_DIR}\Plugins\Plugin_VideoOGL.dll"
File "${BASE_DIR}\Plugins\Plugin_Wiimote.dll"
; GC/Wii static settings
SetOutPath "$INSTDIR\Sys\GC"
SetOverwrite ifnewer
File "..\Data\Sys\GC\font_ansi.bin"
File "..\Data\Sys\GC\font_sjis.bin"
SetOutPath "$INSTDIR\Sys\Wii"
SetOverwrite ifnewer
File "..\Data\Sys\Wii\setting-eur.txt"
File "..\Data\Sys\Wii\setting-jpn.txt"
File "..\Data\Sys\Wii\setting-usa.txt"
; GC/Wii User settings
SetOutPath "$INSTDIR\User\GC"
SetOutPath "$INSTDIR\User\Wii\shared2\sys"
SetOverwrite ifnewer
File "..\Data\User\Wii\shared2\sys\readme.txt"
File "..\Data\User\Wii\shared2\sys\SYSCONF"
; GameConfigs
SetOutPath "$INSTDIR\User\GameConfig"
SetOverwrite ifnewer
File "..\Data\User\GameConfig\*.*"
SectionEnd SectionEnd
Section -AdditionalIcons Section -AdditionalIcons
SetOutPath $INSTDIR CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" "$INSTDIR\uninst.exe"
WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
CreateShortCut "$SMPROGRAMS\Dolphin\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
CreateShortCut "$SMPROGRAMS\Dolphin\Uninstall.lnk" "$INSTDIR\uninst.exe"
SectionEnd SectionEnd
Section -Post Section -Post
@ -113,48 +188,53 @@ Section -Post
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
SectionEnd SectionEnd
; Section descriptions
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "It is recommended that you install all of the included files."
!insertmacro MUI_FUNCTION_DESCRIPTION_END
Function un.onUninstSuccess Function un.onUninstSuccess
HideWindow HideWindow
MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was uninstalled successfully.$\r$\n\
ATTENTION: You must manually delete$\r$\n$INSTDIR"
FunctionEnd FunctionEnd
Function un.onInit Function un.onInit
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2 !insertmacro MUI_UNGETLANGUAGE
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to remove $(^Name)?" IDYES +2
Abort Abort
FunctionEnd FunctionEnd
Section Uninstall Section Uninstall
SetShellVarContext all
; Only uninstall what we put there; all $INSTDIR\User is left as is
Delete "$INSTDIR\uninst.exe"
Delete "$INSTDIR\*.dll"
Delete "$INSTDIR\Plugins\*.dll"
Delete "$INSTDIR\Sys\Wii\setting-usa.txt"
Delete "$INSTDIR\Sys\Wii\setting-jpn.txt"
Delete "$INSTDIR\Sys\Wii\setting-eur.txt"
Delete "$INSTDIR\Sys\GC\font_sjis.bin"
Delete "$INSTDIR\Sys\GC\font_ansi.bin"
Delete "$INSTDIR\DolphinWx.exe"
Delete "$INSTDIR\Plugins\*.*" Delete "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk"
Delete "$INSTDIR\Data\*.*" Delete "$DESKTOP\$(^Name).lnk"
Delete "$INSTDIR\Data_USA\*.*" Delete "$SMPROGRAMS\${PRODUCT_NAME}\$(^Name).lnk"
Delete "$INSTDIR\Data_EUR\*.*"
Delete "$INSTDIR\Data_JAP\*.*"
Delete "$INSTDIR\Help\*.*"
Delete "$INSTDIR\Patches\*.*"
Delete "$INSTDIR\*.*"
Delete "$SMPROGRAMS\Dolphin\Uninstall.lnk" RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
Delete "$SMPROGRAMS\Dolphin\Website.lnk" RMDir "$INSTDIR\Sys\GC"
Delete "$DESKTOP\${PRODUCT_NAME}.lnk" RMDir "$INSTDIR\Sys\Wii"
Delete "$SMPROGRAMS\Dolphin\${PRODUCT_NAME}.lnk" RMDir "$INSTDIR\Sys"
RMDir "$SMPROGRAMS\Dolphin"
RMDir "$INSTDIR\Plugins" RMDir "$INSTDIR\Plugins"
RMDir "$INSTDIR\Help"
RMDir "$INSTDIR\Data_USA"
RMDir "$INSTDIR\Data_EUR"
RMDir "$INSTDIR\Data_JAP"
RMDir "$INSTDIR\Data"
RMDir "$INSTDIR\Patches"
RMDir "$INSTDIR" RMDir "$INSTDIR"
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
SetAutoClose true
; Delete old registry keys SectionEnd
DeleteRegKey HKCU "Software\\${PRODUCT_NAME}"
Function LaunchDolphin
; SetAutoClose true ExecShell "" "$DESKTOP\$(^Name).lnk"
SectionEnd FunctionEnd

264
Installer/Installer_x64.nsi
View file

@ -1,105 +1,190 @@
!define BASE_PATH "..\Binary\x64" !system "GetSVNRev.exe" ; ATTENTION: This MUST be run before this script
!define SETUP_NAME "DolphinSetup_64bit_14b" !include "svnrev.txt" ; !defines PRODUCT_VERSION
!define BASE_DIR "..\Binary\x64"
; Script generated by the HM NIS Edit Script Wizard.
; HM NIS Edit Wizard helper defines ; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "Dolphin (64 bit)" !define PRODUCT_NAME "Dolphin x64"
!define PRODUCT_VERSION "1.4b" !define PRODUCT_PUBLISHER "Dolphin Team"
!define PRODUCT_PUBLISHER "Dolphin DevTeam"
!define PRODUCT_WEB_SITE "http://www.dolphin-emu.com" !define PRODUCT_WEB_SITE "http://www.dolphin-emu.com"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\DolphinWx.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM" !define PRODUCT_UNINST_ROOT_KEY "HKLM"
SetCompressor lzma
; MUI 1.67 compatible ------ ; MUI 1.67 compatible ------
!include "MUI.nsh" !include "MUI.nsh"
; MUI Settings ; MUI Settings
!define MUI_ABORTWARNING !define MUI_ABORTWARNING
!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\modern-install.ico" !define MUI_ICON "Dolphin.ico"
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
!define MUI_WELCOMEFINISHPAGE_BITMAP "wizard.bmp"
; Welcome page ; Language Selection Dialog Settings
!insertmacro MUI_PAGE_WELCOME !define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
; License page ; License page
!insertmacro MUI_PAGE_LICENSE "Licence.txt" !insertmacro MUI_PAGE_LICENSE "Licence.txt"
; Components page
!insertmacro MUI_PAGE_COMPONENTS
; Directory page ; Directory page
!insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_DIRECTORY
; Instfiles page ; Instfiles page
!insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_INSTFILES
; Finish page ; Finish page
!define MUI_FINISHPAGE_RUN "$INSTDIR\DolphinWx.exe" ; We launch the desktop shortcut to set the working dir
!define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_TEXT "Start $(^Name)"
!define MUI_FINISHPAGE_RUN_FUNCTION "LaunchDolphin"
!insertmacro MUI_PAGE_FINISH !insertmacro MUI_PAGE_FINISH
; Uninstaller pages ; Uninstaller pages
!insertmacro MUI_UNPAGE_INSTFILES !insertmacro MUI_UNPAGE_INSTFILES
; Language files ; Language files
!insertmacro MUI_LANGUAGE "Afrikaans"
!insertmacro MUI_LANGUAGE "Albanian"
!insertmacro MUI_LANGUAGE "Arabic"
!insertmacro MUI_LANGUAGE "Basque"
!insertmacro MUI_LANGUAGE "Belarusian"
!insertmacro MUI_LANGUAGE "Bosnian"
!insertmacro MUI_LANGUAGE "Breton"
!insertmacro MUI_LANGUAGE "Bulgarian"
!insertmacro MUI_LANGUAGE "Catalan"
!insertmacro MUI_LANGUAGE "Croatian"
!insertmacro MUI_LANGUAGE "Czech"
!insertmacro MUI_LANGUAGE "Danish"
!insertmacro MUI_LANGUAGE "Dutch"
!insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "English"
!insertmacro MUI_LANGUAGE "Estonian"
!insertmacro MUI_LANGUAGE "Farsi"
!insertmacro MUI_LANGUAGE "Finnish"
!insertmacro MUI_LANGUAGE "French"
!insertmacro MUI_LANGUAGE "Galician"
!insertmacro MUI_LANGUAGE "German"
!insertmacro MUI_LANGUAGE "Greek"
!insertmacro MUI_LANGUAGE "Hebrew"
!insertmacro MUI_LANGUAGE "Hungarian"
!insertmacro MUI_LANGUAGE "Icelandic"
!insertmacro MUI_LANGUAGE "Indonesian"
!insertmacro MUI_LANGUAGE "Irish"
!insertmacro MUI_LANGUAGE "Italian"
!insertmacro MUI_LANGUAGE "Japanese"
!insertmacro MUI_LANGUAGE "Korean"
!insertmacro MUI_LANGUAGE "Kurdish"
!insertmacro MUI_LANGUAGE "Latvian"
!insertmacro MUI_LANGUAGE "Lithuanian"
!insertmacro MUI_LANGUAGE "Luxembourgish"
!insertmacro MUI_LANGUAGE "Macedonian"
!insertmacro MUI_LANGUAGE "Malay"
!insertmacro MUI_LANGUAGE "Mongolian"
!insertmacro MUI_LANGUAGE "Norwegian"
!insertmacro MUI_LANGUAGE "NorwegianNynorsk"
!insertmacro MUI_LANGUAGE "Polish"
!insertmacro MUI_LANGUAGE "Portuguese"
!insertmacro MUI_LANGUAGE "PortugueseBR"
!insertmacro MUI_LANGUAGE "Romanian"
!insertmacro MUI_LANGUAGE "Russian"
!insertmacro MUI_LANGUAGE "Serbian"
!insertmacro MUI_LANGUAGE "SerbianLatin"
!insertmacro MUI_LANGUAGE "SimpChinese"
!insertmacro MUI_LANGUAGE "Slovak"
!insertmacro MUI_LANGUAGE "Slovenian"
!insertmacro MUI_LANGUAGE "Spanish"
!insertmacro MUI_LANGUAGE "SpanishInternational"
!insertmacro MUI_LANGUAGE "Swedish"
!insertmacro MUI_LANGUAGE "Thai"
!insertmacro MUI_LANGUAGE "TradChinese"
!insertmacro MUI_LANGUAGE "Turkish"
!insertmacro MUI_LANGUAGE "Ukrainian"
!insertmacro MUI_LANGUAGE "Uzbek"
!insertmacro MUI_LANGUAGE "Welsh"
; Reserve files
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
; MUI end ------ ; MUI end ------
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
OutFile "${SETUP_NAME}.exe" !define UN_NAME "Uninstall $(^Name)"
InstallDir "$PROGRAMFILES64\Dolphin" OutFile "Dolphin_Installer_x64.exe"
InstallDir "$PROGRAMFILES64\$(^Name)"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
ShowInstDetails show ShowInstDetails show
ShowUnInstDetails show ShowUnInstDetails show
Section "Hauptgruppe" SEC01 Function .onInit
SetOverwrite try !include "x64.nsh"
; This checks if nsis is running under wow64 (since nsis is only 32bit)
; --- copy executable ; hopefully this will be dependable in the future too...
SetOutPath "$INSTDIR" ${If} ${RunningX64}
File "${BASE_PATH}\cg.dll" !insertmacro MUI_LANGDLL_DISPLAY
File "${BASE_PATH}\cgGL.dll" SetRegView 64
File "${BASE_PATH}\DolphinWx.exe" ${Else}
File "Dolphin.ini" MessageBox MB_OK|MB_ICONSTOP "You cannot run this version of Dolphin on your OS.$\r$\n\
Please use a 64-bit OS or download a 32-bit version of Dolphin."
Quit
${EndIf}
FunctionEnd
; --- copy plugins Section "Complete" SEC01
SetShellVarContext all
; Dolphin exe and dlls
; TODO: cg is only for OGL, SDL is only for nJoy
; TODO: Make a nice subsection-ized display
SetOutPath "$INSTDIR"
SetOverwrite ifnewer
File "${BASE_DIR}\DolphinWx.exe"
File "..\Externals\Cg64\cg.dll"
File "..\Externals\Cg64\cgGL.dll"
File "..\Externals\WiiUse\X64\wiiuse.dll"
File "..\Externals\SDL\x64\SDL.dll"
; This needs to be done after DolphinWx.exe is copied
CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\$(^Name).lnk" "$INSTDIR\DolphinWx.exe"
CreateShortCut "$DESKTOP\$(^Name).lnk" "$INSTDIR\DolphinWx.exe"
; Plugins
SetOutPath "$INSTDIR\Plugins" SetOutPath "$INSTDIR\Plugins"
File "${BASE_PATH}\Plugins\Plugin_DSP.dll" SetOverwrite ifnewer
File "${BASE_PATH}\Plugins\Plugin_PadDX9.dll" File "${BASE_DIR}\Plugins\Plugin_DSP_HLE.dll"
File "${BASE_PATH}\Plugins\Plugin_PadSimple.dll" File "${BASE_DIR}\Plugins\Plugin_DSP_LLE.dll"
File "${BASE_PATH}\Plugins\Plugin_VideoDX9.dll" File "${BASE_DIR}\Plugins\Plugin_DSP_NULL.dll"
File "${BASE_PATH}\Plugins\Plugin_VideoOGL.dll" File "${BASE_DIR}\Plugins\Plugin_nJoy_SDL.dll"
File "${BASE_DIR}\Plugins\Plugin_nJoy_SDL_Test.dll"
File "${BASE_DIR}\Plugins\Plugin_PadSimple.dll"
File "${BASE_DIR}\Plugins\Plugin_VideoDX9.dll"
File "${BASE_DIR}\Plugins\Plugin_VideoOGL.dll"
File "${BASE_DIR}\Plugins\Plugin_Wiimote.dll"
; --- copy help ; GC/Wii static settings
; SetOutPath "$INSTDIR\Help" SetOutPath "$INSTDIR\Sys\GC"
; File "${BASE_PATH}\Help\Dolphin.chm" SetOverwrite ifnewer
File "..\Data\Sys\GC\font_ansi.bin"
File "..\Data\Sys\GC\font_sjis.bin"
SetOutPath "$INSTDIR\Sys\Wii"
SetOverwrite ifnewer
File "..\Data\Sys\Wii\setting-eur.txt"
File "..\Data\Sys\Wii\setting-jpn.txt"
File "..\Data\Sys\Wii\setting-usa.txt"
; --- copy data directory ; GC/Wii User settings
SetOutPath "$INSTDIR\Data" SetOutPath "$INSTDIR\User\GC"
File "${BASE_PATH}\Data\*.*" SetOutPath "$INSTDIR\User\Wii\shared2\sys"
SetOverwrite ifnewer
; --- create data directories and copy IPLs File "..\Data\User\Wii\shared2\sys\readme.txt"
SetOutPath "$INSTDIR\Data_EUR" File "..\Data\User\Wii\shared2\sys\SYSCONF"
File "${BASE_PATH}\Data_EUR\SRAM.raw"
SetOutPath "$INSTDIR\Data_JAP"
File "${BASE_PATH}\Data_JAP\SRAM.raw"
SetOutPath "$INSTDIR\Data_USA"
File "${BASE_PATH}\Data_USA\SRAM.raw"
; --- copy patches directory
SetOutPath "$INSTDIR\Patches"
File "${BASE_PATH}\Patches\*.*"
; -- create shortcuts
SetOutPath "$INSTDIR"
CreateDirectory "$SMPROGRAMS\Dolphin"
CreateShortCut "$SMPROGRAMS\Dolphin\${PRODUCT_NAME}.lnk" "$INSTDIR\DolphinWx.exe"
CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\DolphinWx.exe"
; GameConfigs
SetOutPath "$INSTDIR\User\GameConfig"
SetOverwrite ifnewer
File "..\Data\User\GameConfig\*.*"
SectionEnd SectionEnd
Section -AdditionalIcons Section -AdditionalIcons
SetOutPath $INSTDIR CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" "$INSTDIR\uninst.exe"
WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
CreateShortCut "$SMPROGRAMS\Dolphin\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
CreateShortCut "$SMPROGRAMS\Dolphin\Uninstall (64 bit).lnk" "$INSTDIR\uninst.exe"
SectionEnd SectionEnd
Section -Post Section -Post
@ -113,48 +198,53 @@ Section -Post
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
SectionEnd SectionEnd
; Section descriptions
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "It is recommended that you install all of the included files."
!insertmacro MUI_FUNCTION_DESCRIPTION_END
Function un.onUninstSuccess Function un.onUninstSuccess
HideWindow HideWindow
MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was uninstalled successfully.$\r$\n\
ATTENTION: You must manually delete$\r$\n$INSTDIR"
FunctionEnd FunctionEnd
Function un.onInit Function un.onInit
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2 !insertmacro MUI_UNGETLANGUAGE
MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to remove $(^Name)?" IDYES +2
Abort Abort
FunctionEnd FunctionEnd
Section Uninstall Section Uninstall
SetShellVarContext all
; Only uninstall what we put there; all $INSTDIR\User is left as is
Delete "$INSTDIR\uninst.exe"
Delete "$INSTDIR\*.dll"
Delete "$INSTDIR\Plugins\*.dll"
Delete "$INSTDIR\Sys\Wii\setting-usa.txt"
Delete "$INSTDIR\Sys\Wii\setting-jpn.txt"
Delete "$INSTDIR\Sys\Wii\setting-eur.txt"
Delete "$INSTDIR\Sys\GC\font_sjis.bin"
Delete "$INSTDIR\Sys\GC\font_ansi.bin"
Delete "$INSTDIR\DolphinWx.exe"
Delete "$INSTDIR\Plugins\*.*" Delete "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk"
Delete "$INSTDIR\Data\*.*" Delete "$DESKTOP\$(^Name).lnk"
Delete "$INSTDIR\Data_USA\*.*" Delete "$SMPROGRAMS\${PRODUCT_NAME}\$(^Name).lnk"
Delete "$INSTDIR\Data_EUR\*.*"
Delete "$INSTDIR\Data_JAP\*.*"
Delete "$INSTDIR\Help\*.*"
Delete "$INSTDIR\Patches\*.*"
Delete "$INSTDIR\*.*"
Delete "$SMPROGRAMS\Dolphin\Uninstall (64 bit).lnk" RMDir "$SMPROGRAMS\${PRODUCT_NAME}"
Delete "$SMPROGRAMS\Dolphin\Website.lnk" RMDir "$INSTDIR\Sys\GC"
Delete "$DESKTOP\${PRODUCT_NAME}.lnk" RMDir "$INSTDIR\Sys\Wii"
Delete "$SMPROGRAMS\Dolphin\${PRODUCT_NAME}.lnk" RMDir "$INSTDIR\Sys"
RMDir "$SMPROGRAMS\Dolphin"
RMDir "$INSTDIR\Plugins" RMDir "$INSTDIR\Plugins"
RMDir "$INSTDIR\Help"
RMDir "$INSTDIR\Data_USA"
RMDir "$INSTDIR\Data_EUR"
RMDir "$INSTDIR\Data_JAP"
RMDir "$INSTDIR\Data"
RMDir "$INSTDIR\Patches"
RMDir "$INSTDIR" RMDir "$INSTDIR"
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
SetAutoClose true
; Delete old registry keys SectionEnd
DeleteRegKey HKCU "Software\\Dolphin"
Function LaunchDolphin
; SetAutoClose true ExecShell "" "$DESKTOP\$(^Name).lnk"
SectionEnd FunctionEnd

2
Installer/Licence.txt
View file

@ -1 +1 @@
THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT WARRANTY. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS BE LIABLE TO ANY PARTY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THIS PACKAGE. This package is provided “as is” and without warranty. Any express or implied warranties, including, but not limited to, the implied warranties of merchantability and fitness for a particular purpose are disclaimed. In no event shall the authors be liable to any party for any direct, indirect, incidental, special, exemplary, or consequential damages arising in any way out of the use of this package.

BIN
Installer/wizard-uninstall.bmp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 51 KiB

BIN
Installer/wizard.bmp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 51 KiB

2
Source/Core/DolphinWX/Src/ConfigMain.cpp
View file

@ -384,7 +384,7 @@ void CConfigMain::CreateGUIControls()
GraphicSelection = new wxChoice(PluginPage, ID_GRAPHIC_CB, wxDefaultPosition, wxDefaultSize, NULL, 0, wxDefaultValidator); GraphicSelection = new wxChoice(PluginPage, ID_GRAPHIC_CB, wxDefaultPosition, wxDefaultSize, NULL, 0, wxDefaultValidator);
GraphicConfig = new wxButton(PluginPage, ID_GRAPHIC_CONFIG, wxT("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); GraphicConfig = new wxButton(PluginPage, ID_GRAPHIC_CONFIG, wxT("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
sbDSPPlugin = new wxStaticBoxSizer(wxHORIZONTAL, PluginPage, wxT("Toolbar_PluginDSP")); sbDSPPlugin = new wxStaticBoxSizer(wxHORIZONTAL, PluginPage, wxT("DSP"));
DSPSelection = new wxChoice(PluginPage, ID_DSP_CB, wxDefaultPosition, wxDefaultSize, NULL, 0, wxDefaultValidator); DSPSelection = new wxChoice(PluginPage, ID_DSP_CB, wxDefaultPosition, wxDefaultSize, NULL, 0, wxDefaultValidator);
DSPConfig = new wxButton(PluginPage, ID_DSP_CONFIG, wxT("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); DSPConfig = new wxButton(PluginPage, ID_DSP_CONFIG, wxT("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);

8
Source/Core/DolphinWX/Src/ISOProperties.cpp
View file

@ -71,10 +71,10 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW
{ {
FILE *f = fopen(GameIniFile.c_str(), "w"); FILE *f = fopen(GameIniFile.c_str(), "w");
fprintf(f, "# %s - %s\n", OpenISO->GetUniqueID().c_str(), OpenISO->GetName().c_str()); fprintf(f, "# %s - %s\n", OpenISO->GetUniqueID().c_str(), OpenISO->GetName().c_str());
fprintf(f, "[Core]\n#Values set here will override the main dolphin settings.\n"); fprintf(f, "[Core] Values set here will override the main dolphin settings.\n");
fprintf(f, "[EmuState]\n#The Emulation State. 1 is worst, 5 is best, 0 is not set.\n"); fprintf(f, "[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.\n");
fprintf(f, "[OnFrame]\n#Add memory patches to be applied every frame here.\n"); fprintf(f, "[OnFrame] Add memory patches to be applied every frame here.\n");
fprintf(f, "[ActionReplay]\n#Add action replay cheats here.\n"); fprintf(f, "[ActionReplay] Add action replay cheats here.\n");
fclose(f); fclose(f);
if (GameIni.Load(GameIniFile.c_str())) if (GameIni.Load(GameIniFile.c_str()))
LoadGameConfig(); LoadGameConfig();