diff --git a/Installer/Dolphin.ini b/Installer/Dolphin.ini deleted file mode 100644 index 2b80e832b0..0000000000 --- a/Installer/Dolphin.ini +++ /dev/null @@ -1,4 +0,0 @@ -[Default] -GFXPlugin = Plugins\Plugin_VideoOGL.dll -DSPPlugin = Plugins\Plugin_DSP_HLE.dll -PadPlugin = Plugins\Plugin_PadSimple.dll diff --git a/Installer/GetSVNRev.nsi b/Installer/GetSVNRev.nsi new file mode 100644 index 0000000000..4b45cdc054 --- /dev/null +++ b/Installer/GetSVNRev.nsi @@ -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 \ No newline at end of file diff --git a/Installer/Installer_win32.nsi b/Installer/Installer_win32.nsi index 1104b42a55..f28105aa2b 100644 --- a/Installer/Installer_win32.nsi +++ b/Installer/Installer_win32.nsi @@ -1,105 +1,180 @@ -!define BASE_PATH "..\Binary\win32" -!define SETUP_NAME "DolphinSetup_32bit_14b" - -; Script generated by the HM NIS Edit Script Wizard. +!system "GetSVNRev.exe" ; ATTENTION: This MUST be run before this script +!include "svnrev.txt" ; !defines PRODUCT_VERSION +!define BASE_DIR "..\Binary\win32" ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "Dolphin" -!define PRODUCT_VERSION "1.4b" -!define PRODUCT_PUBLISHER "Dolphin DevTeam" +!define PRODUCT_PUBLISHER "Dolphin Team" !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_ROOT_KEY "HKLM" +SetCompressor lzma + ; MUI 1.67 compatible ------ !include "MUI.nsh" ; MUI Settings !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_WELCOMEFINISHPAGE_BITMAP "wizard.bmp" - -; Welcome page -!insertmacro MUI_PAGE_WELCOME +; Language Selection Dialog Settings +!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 !insertmacro MUI_PAGE_LICENSE "Licence.txt" +; Components page +!insertmacro MUI_PAGE_COMPONENTS ; Directory page !insertmacro MUI_PAGE_DIRECTORY ; Instfiles page !insertmacro MUI_PAGE_INSTFILES ; 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 ; Uninstaller pages !insertmacro MUI_UNPAGE_INSTFILES ; 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 "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 ------ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "${SETUP_NAME}.exe" -InstallDir "$PROGRAMFILES32\Dolphin" +!define UN_NAME "Uninstall $(^Name)" +OutFile "Dolphin_Installer_win32.exe" +InstallDir "$PROGRAMFILES\$(^Name)" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show ShowUnInstDetails show -Section "Hauptgruppe" SEC01 - SetOverwrite try - - ; --- copy executable - SetOutPath "$INSTDIR" - File "${BASE_PATH}\cg.dll" - File "${BASE_PATH}\cgGL.dll" - File "${BASE_PATH}\DolphinWx.exe" - File "Dolphin.ini" - - ; --- 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 +Function .onInit + !insertmacro MUI_LANGDLL_DISPLAY +FunctionEnd + +Section "Base" 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\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}" - CreateShortCut "$SMPROGRAMS\Dolphin\${PRODUCT_NAME}.lnk" "$INSTDIR\DolphinWx.exe" - CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\DolphinWx.exe" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\$(^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 Section -AdditionalIcons - SetOutPath $INSTDIR - 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" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" "$INSTDIR\uninst.exe" SectionEnd Section -Post @@ -113,48 +188,53 @@ Section -Post WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" 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 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 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 FunctionEnd 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 "$INSTDIR\Data\*.*" - Delete "$INSTDIR\Data_USA\*.*" - Delete "$INSTDIR\Data_EUR\*.*" - Delete "$INSTDIR\Data_JAP\*.*" - Delete "$INSTDIR\Help\*.*" - Delete "$INSTDIR\Patches\*.*" - Delete "$INSTDIR\*.*" + Delete "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" + Delete "$DESKTOP\$(^Name).lnk" + Delete "$SMPROGRAMS\${PRODUCT_NAME}\$(^Name).lnk" - Delete "$SMPROGRAMS\Dolphin\Uninstall.lnk" - Delete "$SMPROGRAMS\Dolphin\Website.lnk" - Delete "$DESKTOP\${PRODUCT_NAME}.lnk" - Delete "$SMPROGRAMS\Dolphin\${PRODUCT_NAME}.lnk" - - RMDir "$SMPROGRAMS\Dolphin" + RMDir "$SMPROGRAMS\${PRODUCT_NAME}" + RMDir "$INSTDIR\Sys\GC" + RMDir "$INSTDIR\Sys\Wii" + RMDir "$INSTDIR\Sys" 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" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" - - ; Delete old registry keys - DeleteRegKey HKCU "Software\\${PRODUCT_NAME}" - - ; SetAutoClose true -SectionEnd \ No newline at end of file + SetAutoClose true +SectionEnd + +Function LaunchDolphin + ExecShell "" "$DESKTOP\$(^Name).lnk" +FunctionEnd \ No newline at end of file diff --git a/Installer/Installer_x64.nsi b/Installer/Installer_x64.nsi index 711ef25ad4..f98599030b 100644 --- a/Installer/Installer_x64.nsi +++ b/Installer/Installer_x64.nsi @@ -1,105 +1,190 @@ -!define BASE_PATH "..\Binary\x64" -!define SETUP_NAME "DolphinSetup_64bit_14b" - -; Script generated by the HM NIS Edit Script Wizard. +!system "GetSVNRev.exe" ; ATTENTION: This MUST be run before this script +!include "svnrev.txt" ; !defines PRODUCT_VERSION +!define BASE_DIR "..\Binary\x64" ; HM NIS Edit Wizard helper defines -!define PRODUCT_NAME "Dolphin (64 bit)" -!define PRODUCT_VERSION "1.4b" -!define PRODUCT_PUBLISHER "Dolphin DevTeam" +!define PRODUCT_NAME "Dolphin x64" +!define PRODUCT_PUBLISHER "Dolphin Team" !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_ROOT_KEY "HKLM" +SetCompressor lzma + ; MUI 1.67 compatible ------ !include "MUI.nsh" ; MUI Settings !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_WELCOMEFINISHPAGE_BITMAP "wizard.bmp" - -; Welcome page -!insertmacro MUI_PAGE_WELCOME +; Language Selection Dialog Settings +!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 !insertmacro MUI_PAGE_LICENSE "Licence.txt" +; Components page +!insertmacro MUI_PAGE_COMPONENTS ; Directory page !insertmacro MUI_PAGE_DIRECTORY ; Instfiles page !insertmacro MUI_PAGE_INSTFILES ; 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 ; Uninstaller pages !insertmacro MUI_UNPAGE_INSTFILES ; 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 "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 ------ Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "${SETUP_NAME}.exe" -InstallDir "$PROGRAMFILES64\Dolphin" +!define UN_NAME "Uninstall $(^Name)" +OutFile "Dolphin_Installer_x64.exe" +InstallDir "$PROGRAMFILES64\$(^Name)" InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show ShowUnInstDetails show -Section "Hauptgruppe" SEC01 - SetOverwrite try - - ; --- copy executable - SetOutPath "$INSTDIR" - File "${BASE_PATH}\cg.dll" - File "${BASE_PATH}\cgGL.dll" - File "${BASE_PATH}\DolphinWx.exe" - File "Dolphin.ini" +Function .onInit + !include "x64.nsh" + ; This checks if nsis is running under wow64 (since nsis is only 32bit) + ; hopefully this will be dependable in the future too... + ${If} ${RunningX64} + !insertmacro MUI_LANGDLL_DISPLAY + SetRegView 64 + ${Else} + 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" - 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" + 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" - ; --- copy help - ; SetOutPath "$INSTDIR\Help" - ; File "${BASE_PATH}\Help\Dolphin.chm" + ; 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" - ; --- 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" - CreateDirectory "$SMPROGRAMS\Dolphin" - CreateShortCut "$SMPROGRAMS\Dolphin\${PRODUCT_NAME}.lnk" "$INSTDIR\DolphinWx.exe" - CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\DolphinWx.exe" + ; 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 Section -AdditionalIcons - SetOutPath $INSTDIR - 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" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" "$INSTDIR\uninst.exe" SectionEnd Section -Post @@ -113,48 +198,53 @@ Section -Post WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" 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 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 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 FunctionEnd 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 "$INSTDIR\Data\*.*" - Delete "$INSTDIR\Data_USA\*.*" - Delete "$INSTDIR\Data_EUR\*.*" - Delete "$INSTDIR\Data_JAP\*.*" - Delete "$INSTDIR\Help\*.*" - Delete "$INSTDIR\Patches\*.*" - Delete "$INSTDIR\*.*" + Delete "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" + Delete "$DESKTOP\$(^Name).lnk" + Delete "$SMPROGRAMS\${PRODUCT_NAME}\$(^Name).lnk" - Delete "$SMPROGRAMS\Dolphin\Uninstall (64 bit).lnk" - Delete "$SMPROGRAMS\Dolphin\Website.lnk" - Delete "$DESKTOP\${PRODUCT_NAME}.lnk" - Delete "$SMPROGRAMS\Dolphin\${PRODUCT_NAME}.lnk" - - RMDir "$SMPROGRAMS\Dolphin" + RMDir "$SMPROGRAMS\${PRODUCT_NAME}" + RMDir "$INSTDIR\Sys\GC" + RMDir "$INSTDIR\Sys\Wii" + RMDir "$INSTDIR\Sys" 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" DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" - - ; Delete old registry keys - DeleteRegKey HKCU "Software\\Dolphin" - - ; SetAutoClose true -SectionEnd \ No newline at end of file + SetAutoClose true +SectionEnd + +Function LaunchDolphin + ExecShell "" "$DESKTOP\$(^Name).lnk" +FunctionEnd \ No newline at end of file diff --git a/Installer/Licence.txt b/Installer/Licence.txt index d93173f6e1..6677818106 100644 --- a/Installer/Licence.txt +++ b/Installer/Licence.txt @@ -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. \ No newline at end of file +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. diff --git a/Installer/wizard-uninstall.bmp b/Installer/wizard-uninstall.bmp deleted file mode 100644 index 097d094292..0000000000 Binary files a/Installer/wizard-uninstall.bmp and /dev/null differ diff --git a/Installer/wizard.bmp b/Installer/wizard.bmp deleted file mode 100644 index 196a5b7a7e..0000000000 Binary files a/Installer/wizard.bmp and /dev/null differ diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 3dafa8d8cc..5a622f06b8 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -384,7 +384,7 @@ void CConfigMain::CreateGUIControls() 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); - 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); DSPConfig = new wxButton(PluginPage, ID_DSP_CONFIG, wxT("Config..."), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp index e5f52d0e6b..d8c2fc89f6 100644 --- a/Source/Core/DolphinWX/Src/ISOProperties.cpp +++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp @@ -71,10 +71,10 @@ CISOProperties::CISOProperties(const std::string fileName, wxWindow* parent, wxW { FILE *f = fopen(GameIniFile.c_str(), "w"); 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, "[EmuState]\n#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, "[ActionReplay]\n#Add action replay cheats here.\n"); + fprintf(f, "[Core] Values set here will override the main dolphin settings.\n"); + fprintf(f, "[EmuState] The Emulation State. 1 is worst, 5 is best, 0 is not set.\n"); + fprintf(f, "[OnFrame] Add memory patches to be applied every frame here.\n"); + fprintf(f, "[ActionReplay] Add action replay cheats here.\n"); fclose(f); if (GameIni.Load(GameIniFile.c_str())) LoadGameConfig();