diff --git a/CMakeLists.txt b/CMakeLists.txt index 6637ce46b3..aa784e0b16 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.6) project(dolphin-emu) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) -set(DOLPHIN_IS_STABLE TRUE) +set(DOLPHIN_IS_STABLE FALSE) # Set up paths set(bindir ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir") @@ -47,6 +47,11 @@ function(enable_precompiled_headers PRECOMPILED_HEADER SOURCE_FILE SOURCE_VARIAB endfunction(enable_precompiled_headers) +include(FindSubversion OPTIONAL) # for revision info +if(Subversion_FOUND AND NOT DOLPHIN_WC_REVISION) + Subversion_WC_INFO(${CMAKE_CURRENT_SOURCE_DIR} DOLPHIN) # defines DOLPHIN_WC_REVISION +endif() + # Various compile flags add_definitions(-msse2) @@ -401,6 +406,8 @@ endif(NOT DISABLE_WX) ######################################## # Pre-build events: Define configuration variables and write svnrev header # +file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/Src/svnrev.h + "#define SVN_REV_STR \"" ${DOLPHIN_WC_REVISION} "-" ${CMAKE_BUILD_TYPE} "\"\n") include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common/Src") @@ -429,7 +436,7 @@ endif() # packaging information set(CPACK_PACKAGE_NAME "dolphin-emu") set(CPACK_PACKAGE_VENDOR "Dolphin Team") -set(CPACK_PACKAGE_VERSION_MAJOR "3") +set(CPACK_PACKAGE_VERSION_MAJOR "2") set(CPACK_PACKAGE_VERSION_MINOR "0") if(DOLPHIN_IS_STABLE) diff --git a/Installer/GetSVNRev.nsi b/Installer/GetSVNRev.nsi new file mode 100644 index 0000000000..c9f0c166d7 --- /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 new file mode 100644 index 0000000000..5b16c60517 --- /dev/null +++ b/Installer/Installer_win32.nsi @@ -0,0 +1,243 @@ +!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_PUBLISHER "Dolphin Team" +!define PRODUCT_WEB_SITE "http://www.dolphin-emu.com" +!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Dolphin.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 "Dolphin.ico" +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" + +; 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 +; 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}" +!define UN_NAME "Uninstall $(^Name)" +OutFile "Dolphin_Installer_win32.exe" +InstallDir "$PROGRAMFILES\$(^Name)" +InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" +ShowInstDetails show +ShowUnInstDetails show + +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}\Dolphin.exe" + File "..\Externals\Cg\cg.dll" + File "..\Externals\Cg\cgGL.dll" + ; File "..\Externals\Cg\cgD3D9.dll" + File "..\Externals\WiiUse\Win32\wiiuse.dll" + File "..\Externals\SDL\win32\SDL.dll" + File "..\Externals\OpenAL\win32\OpenAL32.dll" + File "..\Externals\OpenAL\win32\wrap_oal.dll" + ; This needs to be done after Dolphin.exe is copied + CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Dolphin.lnk" "$INSTDIR\Dolphin.exe" + CreateShortCut "$DESKTOP\Dolphin.lnk" "$INSTDIR\Dolphin.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_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" + File "${BASE_DIR}\Plugins\Plugin_VideoSW.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 + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" "$INSTDIR\uninst.exe" +SectionEnd + +Section -Post + WriteUninstaller "$INSTDIR\uninst.exe" + WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Dolphin.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Dolphin.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" + 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 uninstalled successfully.$\r$\n\ + ATTENTION: You must manually delete$\r$\n$INSTDIR" +FunctionEnd + +Function un.onInit +!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\Dolphin.exe" + + Delete "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" + Delete "$DESKTOP\Dolphin.lnk" + Delete "$SMPROGRAMS\${PRODUCT_NAME}\Dolphin.lnk" + + RMDir "$SMPROGRAMS\${PRODUCT_NAME}" + RMDir "$INSTDIR\Sys\GC" + RMDir "$INSTDIR\Sys\Wii" + RMDir "$INSTDIR\Sys" + RMDir "$INSTDIR\Plugins" + RMDir "$INSTDIR" + + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" + SetAutoClose true +SectionEnd + +Function LaunchDolphin + ExecShell "" "$DESKTOP\Dolphin.lnk" +FunctionEnd \ No newline at end of file diff --git a/Installer/Installer_x64.nsi b/Installer/Installer_x64.nsi new file mode 100644 index 0000000000..f5c8648fe1 --- /dev/null +++ b/Installer/Installer_x64.nsi @@ -0,0 +1,253 @@ +!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 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\Dolphin.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 "Dolphin.ico" +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" + +; 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 +; 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}" +!define UN_NAME "Uninstall $(^Name)" +OutFile "Dolphin_Installer_x64.exe" +InstallDir "$PROGRAMFILES64\$(^Name)" +InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" +ShowInstDetails show +ShowUnInstDetails show + +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 + +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}\Dolphin.exe" + File "..\Externals\Cg64\cg.dll" + File "..\Externals\Cg64\cgGL.dll" + ; File "..\Externals\Cg64\cgD3D9.dll" + File "..\Externals\WiiUse\X64\wiiuse.dll" + File "..\Externals\SDL\x64\SDL.dll" + File "..\Externals\OpenAL\win64\OpenAL32.dll" + File "..\Externals\OpenAL\win64\wrap_oal.dll" + ; This needs to be done after Dolphin.exe is copied + CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}" + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Dolphin x64.lnk" "$INSTDIR\Dolphin.exe" + CreateShortCut "$DESKTOP\Dolphin x64.lnk" "$INSTDIR\Dolphin.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_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" + File "${BASE_DIR}\Plugins\Plugin_VideoSW.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 + CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" "$INSTDIR\uninst.exe" +SectionEnd + +Section -Post + WriteUninstaller "$INSTDIR\uninst.exe" + WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\Dolphin.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\Dolphin.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" + 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 uninstalled successfully.$\r$\n\ + ATTENTION: You must manually delete$\r$\n$INSTDIR" +FunctionEnd + +Function un.onInit +!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\Dolphin.exe" + + Delete "$SMPROGRAMS\${PRODUCT_NAME}\${UN_NAME}.lnk" + Delete "$DESKTOP\Dolphin x64.lnk" + Delete "$SMPROGRAMS\${PRODUCT_NAME}\Dolphin x64.lnk" + + RMDir "$SMPROGRAMS\${PRODUCT_NAME}" + RMDir "$INSTDIR\Sys\GC" + RMDir "$INSTDIR\Sys\Wii" + RMDir "$INSTDIR\Sys" + RMDir "$INSTDIR\Plugins" + RMDir "$INSTDIR" + + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" + SetAutoClose true +SectionEnd + +Function LaunchDolphin + ExecShell "" "$DESKTOP\Dolphin x64.lnk" +FunctionEnd \ No newline at end of file diff --git a/Installer/Licence.txt b/Installer/Licence.txt new file mode 100644 index 0000000000..e7764ee587 --- /dev/null +++ b/Installer/Licence.txt @@ -0,0 +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. diff --git a/Languages/Languages.vcxproj b/Languages/Languages.vcxproj index 3981324e79..b24af48cc2 100644 --- a/Languages/Languages.vcxproj +++ b/Languages/Languages.vcxproj @@ -61,27 +61,55 @@ + + + + + + + + + + + + + + + + + Document + + + + + + + + + + + diff --git a/SConstruct b/SConstruct index ffb4ace978..a563823859 100755 --- a/SConstruct +++ b/SConstruct @@ -92,6 +92,8 @@ if not env.has_key('install') or env['install'] == 'local': if env['flavor'] == 'debug' or env['flavor'] == 'prof': env['prefix'] += '-' + env['flavor'] +env['svnrev'] = os.popen('svnversion -n .').read().split(':')[0] + # OS X specifics if sys.platform == 'darwin': #ccld = ['-mmacosx-version-min=10.5.4'] @@ -121,7 +123,7 @@ if sys.platform == 'darwin': if env['bundle']: app = env['prefix'] + '/Dolphin.app' - dmg = env['prefix'] + '/Dolphin-3.0' + '.dmg' + dmg = env['prefix'] + '/Dolphin-r' + env['svnrev'] + '.dmg' env.Command(dmg, app, 'rm -f ' + dmg + ' && hdiutil create -srcfolder ' + app + ' -format UDBZ ' + dmg + ' && hdiutil internet-enable -yes ' + dmg) @@ -235,7 +237,7 @@ else: else: print "Can't build prof without oprofile, disabling" - tarname = 'dolphin-3.0' + tarname = 'dolphin-' + env['svnrev'] env['TARFLAGS'] = '-cj' env['TARSUFFIX'] = '.tar.bz2' diff --git a/Source/Core/Common/SConscript b/Source/Core/Common/SConscript index 0706fb9439..74eebdd611 100644 --- a/Source/Core/Common/SConscript +++ b/Source/Core/Common/SConscript @@ -4,6 +4,17 @@ Import('env') import os import sys +def createVersion(env, target, source): + tmpstr = open(source[0].path, 'r').read().\ + replace("$WCMODS?$WCREV$M:$WCREV$$", env['svnrev']) + outfile = open(target[0].path, 'w') + outfile.write(tmpstr + '\n') + outfile.close() + +Execute(Delete('Src/svnrev.h')) +env.Command('Src/svnrev.h', 'Src/svnrev_template.h', + [Delete('${TARGET.srcpath}'), createVersion]) + files = [ 'Src/ABI.cpp', 'Src/BreakPoints.cpp', diff --git a/Source/Core/Common/SVNRevGen.vcxproj b/Source/Core/Common/SVNRevGen.vcxproj new file mode 100644 index 0000000000..45d6d10368 --- /dev/null +++ b/Source/Core/Common/SVNRevGen.vcxproj @@ -0,0 +1,63 @@ + + + + + Release + x64 + + + + + cscript /nologo /E:JScript "make_svnrev.h.js" + Updating svnrev.h + dummy + + + + + + + + {69F00340-5C3D-449F-9A80-958435C6CF06} + SVNRevGen + + + + Utility + false + Unicode + + + + + + + + + + + + + Level3 + MaxSpeed + true + true + + + true + true + true + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Core/Common/Src/Version.cpp b/Source/Core/Common/Src/Version.cpp index 83531e2bc8..4f2f0b1d77 100644 --- a/Source/Core/Common/Src/Version.cpp +++ b/Source/Core/Common/Src/Version.cpp @@ -19,11 +19,11 @@ #include "svnrev.h" #ifdef _DEBUG -const char *svn_rev_str = "Dolphin Debug " SVN_REV_STR; +const char *svn_rev_str = "Dolphin Debug r" SVN_REV_STR; #elif defined DEBUGFAST -const char *svn_rev_str = "Dolphin Debugfast " SVN_REV_STR; +const char *svn_rev_str = "Dolphin Debugfast r" SVN_REV_STR; #else -const char *svn_rev_str = "Dolphin " SVN_REV_STR; +const char *svn_rev_str = "Dolphin r" SVN_REV_STR; #endif #ifdef _M_X64 diff --git a/Source/Core/Common/Src/svnrev.h b/Source/Core/Common/Src/svnrev.h deleted file mode 100644 index fa15eb308c..0000000000 --- a/Source/Core/Common/Src/svnrev.h +++ /dev/null @@ -1 +0,0 @@ -#define SVN_REV_STR "3.0" diff --git a/Source/Core/Common/Src/svnrev_template.h b/Source/Core/Common/Src/svnrev_template.h new file mode 100644 index 0000000000..0d3e482e1b --- /dev/null +++ b/Source/Core/Common/Src/svnrev_template.h @@ -0,0 +1 @@ +#define SVN_REV_STR "$WCMODS?$WCREV$M:$WCREV$$" diff --git a/Source/Core/Common/SubWCRev.exe b/Source/Core/Common/SubWCRev.exe new file mode 100644 index 0000000000..32a252b58b Binary files /dev/null and b/Source/Core/Common/SubWCRev.exe differ diff --git a/Source/Core/Common/make_svnrev.h.js b/Source/Core/Common/make_svnrev.h.js new file mode 100644 index 0000000000..38bcda312a --- /dev/null +++ b/Source/Core/Common/make_svnrev.h.js @@ -0,0 +1,79 @@ +var wshShell = new ActiveXObject("WScript.Shell") +var oFS = new ActiveXObject("Scripting.FileSystemObject"); + +var outfile = "./Src/svnrev.h"; +var svncmd = "SubWCRev ../../.. ./Src/svnrev_template.h " + outfile; +var svntestcmd = "SubWCRev ../../.."; +var hgcmd = "hg svn info"; + +var SVN = 1, HG = 2; +var file_rev = 0, cur_rev = 0, cur_cms = 0; + +function RunCmdGetMatch(cmd, regex) +{ + // run the command + try + { + var cmdexec = wshShell.Exec(cmd); + } + catch (e) + { + // catch "the system cannot find the file specified" error + return 0; + } + // ReadLine is synchronous + while (!cmdexec.StdOut.AtEndOfStream) + { + var reg_exec = regex.exec(cmdexec.StdOut.ReadLine()) + if (reg_exec) + return reg_exec[1]; // return first capture group + } + // failed + return 0; +} + +if (oFS.FileExists(outfile)) +{ + // file exists, read the value of SVN_REV_STR + file_rev = oFS.OpenTextFile(outfile).ReadLine().match(/\d+/); +} +else +{ + // file doesn't exist, create it + oFS.CreateTextFile(outfile); +} + +// get the "Last commited at revision" from SubWCRev's output +cur_rev = RunCmdGetMatch(svntestcmd, /^Last .*?(\d+)/); +if (cur_rev) + cur_cms = SVN; +else +{ + // SubWCRev failed, so use hg + cur_rev = RunCmdGetMatch(hgcmd, /Revision.*?(\d+)/); + if (cur_rev) + cur_cms = HG; + else + { + WScript.Echo("Neither SVN or Hg revision info found!"); + WScript.Quit(1); + } +} + +// check if svnrev.h needs updating +if (cur_rev == file_rev) +{ + WScript.Echo("svnrev.h doesn't need updating (already at " + cur_rev + ")"); + WScript.Quit(0); +} +else if (cur_cms == SVN) +{ + // update using SubWCRev and template file + var ret = wshShell.run(svncmd, 0, true); +} +else +{ + // manually create the file + oFS.CreateTextFile(outfile, true).WriteLine("#define SVN_REV_STR \"" + cur_rev + "\""); +} +WScript.Echo("svnrev.h updated (" + cur_rev + ")"); \ No newline at end of file diff --git a/Source/Core/DolphinWX/SConscript b/Source/Core/DolphinWX/SConscript index 143255503d..a5a62bb558 100644 --- a/Source/Core/DolphinWX/SConscript +++ b/Source/Core/DolphinWX/SConscript @@ -113,7 +113,7 @@ elif sys.platform == 'darwin': CFBundleIdentifier = 'com.dolphin-emulator.dolphin', CFBundleLocalizations = languages, CFBundlePackageType = 'APPL', - CFBundleShortVersionString = '0', + CFBundleShortVersionString = env['svnrev'], CFBundleVersion = '3.0', LSMinimumSystemVersion = '10.5.4', LSRequiresCarbon = True, diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index c11dcf7e59..19554b4de3 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -49,12 +49,27 @@ static const wxLanguage langIds[] = { wxLANGUAGE_DEFAULT, wxLANGUAGE_ARABIC, + wxLANGUAGE_CATALAN, + wxLANGUAGE_CHINESE_SIMPLIFIED, + wxLANGUAGE_CHINESE_TRADITIONAL, + wxLANGUAGE_CZECH, + wxLANGUAGE_DANISH, + wxLANGUAGE_DUTCH, wxLANGUAGE_ENGLISH, wxLANGUAGE_FRENCH, + wxLANGUAGE_GERMAN, wxLANGUAGE_GREEK, + wxLANGUAGE_HEBREW, wxLANGUAGE_HUNGARIAN, + wxLANGUAGE_ITALIAN, + wxLANGUAGE_JAPANESE, + wxLANGUAGE_KOREAN, + wxLANGUAGE_NORWEGIAN_BOKMAL, + wxLANGUAGE_POLISH, wxLANGUAGE_PORTUGUESE, wxLANGUAGE_PORTUGUESE_BRAZILIAN, + wxLANGUAGE_RUSSIAN, + wxLANGUAGE_SERBIAN, wxLANGUAGE_SPANISH, wxLANGUAGE_TURKISH, }; @@ -273,12 +288,27 @@ void CConfigMain::InitializeGUILists() // keep these in sync with the langIds array at the beginning of this file arrayStringFor_InterfaceLang.Add(_("")); arrayStringFor_InterfaceLang.Add(_("Arabic")); + arrayStringFor_InterfaceLang.Add(_("Catalan")); + arrayStringFor_InterfaceLang.Add(_("Chinese (Simplified)")); + arrayStringFor_InterfaceLang.Add(_("Chinese (Traditional)")); + arrayStringFor_InterfaceLang.Add(_("Czech")); + arrayStringFor_InterfaceLang.Add(_("Danish")); + arrayStringFor_InterfaceLang.Add(_("Dutch")); arrayStringFor_InterfaceLang.Add(_("English")); arrayStringFor_InterfaceLang.Add(_("French")); + arrayStringFor_InterfaceLang.Add(_("German")); arrayStringFor_InterfaceLang.Add(_("Greek")); + arrayStringFor_InterfaceLang.Add(_("Hebrew")); arrayStringFor_InterfaceLang.Add(_("Hungarian")); + arrayStringFor_InterfaceLang.Add(_("Italian")); + arrayStringFor_InterfaceLang.Add(_("Japanese")); + arrayStringFor_InterfaceLang.Add(_("Korean")); + arrayStringFor_InterfaceLang.Add(_("Norwegian Bokmaal")); + arrayStringFor_InterfaceLang.Add(_("Polish")); arrayStringFor_InterfaceLang.Add(_("Portuguese")); arrayStringFor_InterfaceLang.Add(_("Portuguese (Brazilian)")); + arrayStringFor_InterfaceLang.Add(_("Russian")); + arrayStringFor_InterfaceLang.Add(_("Serbian")); arrayStringFor_InterfaceLang.Add(_("Spanish")); arrayStringFor_InterfaceLang.Add(_("Turkish")); } diff --git a/Source/Dolphin_2010.sln b/Source/Dolphin_2010.sln index ee6b972231..e0c9592338 100644 --- a/Source/Dolphin_2010.sln +++ b/Source/Dolphin_2010.sln @@ -13,53 +13,80 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\D EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Core\Common\Common.vcxproj", "{C87A4178-44F6-49B2-B7AA-C79AF1B8C534}" + ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SVNRevGen", "Core\Common\SVNRevGen.vcxproj", "{69F00340-5C3D-449F-9A80-958435C6CF06}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AudioCommon", "Core\AudioCommon\AudioCommon.vcxproj", "{37D007BD-D66C-4EAF-B56C-BD1AAC340A05}" ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SOIL", "..\Externals\SOIL\SOIL.vcxproj", "{8544F1FF-F2A5-42D8-A568-C56B5D3B4181}" + ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SFML_Network", "..\Externals\SFML\build\vc2010\SFML_Network.vcxproj", "{93D73454-2512-424E-9CDA-4BB357FE13DD}" + ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LZO", "..\Externals\LZO\LZO.vcxproj", "{D8890B98-26F7-4CFF-BBFB-B95F371B5F20}" + ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\Externals\zlib\zlib.vcxproj", "{3E1339F5-9311-4122-9442-369702E8FCAD}" + ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxAdv28", "..\Externals\wxWidgets\build\msw\wx_adv.vcxproj", "{0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E}" ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxAui", "..\Externals\wxWidgets\build\msw\wx_aui.vcxproj", "{05C75041-D67D-4903-A362-8395A7B35C75}" ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {11F55366-12EC-4C44-A8CB-1D4E315D61ED} = {11F55366-12EC-4C44-A8CB-1D4E315D61ED} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxBase28", "..\Externals\wxWidgets\build\msw\wx_base.vcxproj", "{1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE}" ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxCore28", "..\Externals\wxWidgets\build\msw\wx_core.vcxproj", "{11F55366-12EC-4C44-A8CB-1D4E315D61ED}" ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} = {1C8436C9-DBAF-42BE-83BC-CF3EC9175ABE} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoCommon", "Core\VideoCommon\VideoCommon.vcxproj", "{3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF}" ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {AA862E5E-A993-497A-B6A0-0E8E94B10050} = {AA862E5E-A993-497A-B6A0-0E8E94B10050} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} {8544F1FF-F2A5-42D8-A568-C56B5D3B4181} = {8544F1FF-F2A5-42D8-A568-C56B5D3B4181} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CLRun", "..\Externals\CLRun\clrun\CLRun.vcxproj", "{AA862E5E-A993-497A-B6A0-0E8E94B10050}" + ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxproj", "{8C60E805-0DA5-4E25-8F84-038DB504BB0D}" ProjectSection(ProjectDependencies) = postProject {CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6} = {CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6} + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {93D73454-2512-424E-9CDA-4BB357FE13DD} = {93D73454-2512-424E-9CDA-4BB357FE13DD} {B6398059-EBB6-4C34-B547-95F365B71FF4} = {B6398059-EBB6-4C34-B547-95F365B71FF4} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} @@ -68,9 +95,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "Core\Core\Core.vcxp EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bochs_disasm", "..\Externals\Bochs_disasm\Bochs_disasm.vcxproj", "{CD3D4C3C-1027-4D33-B047-AEC7B56D0BF6}" + ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DiscIO", "Core\DiscIO\DiscIO.vcxproj", "{B6398059-EBB6-4C34-B547-95F365B71FF4}" ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} {3E1339F5-9311-4122-9442-369702E8FCAD} = {3E1339F5-9311-4122-9442-369702E8FCAD} EndProjectSection @@ -78,6 +109,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX9", "Plugins\Plugin_VideoDX9\Plugin_VideoDX9.vcxproj", "{DC7D7AF4-CE47-49E8-8B63-265CB6233A49}" ProjectSection(ProjectDependencies) = postProject {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} EndProjectSection @@ -85,6 +117,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoDX11", "Plugins\Plugin_VideoDX11\Plugin_VideoDX11.vcxproj", "{9A4C733C-BADE-4AC6-B58A-6E274395E90E}" ProjectSection(ProjectDependencies) = postProject {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} EndProjectSection @@ -92,14 +125,19 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoOGL", "Plugins\Plugin_VideoOGL\Plugin_VideoOGL.vcxproj", "{1909CD2D-1707-456F-86CA-0DF42A727C99}" ProjectSection(ProjectDependencies) = postProject {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} = {3E5C4E02-1BA9-4776-BDBE-E3F91FFA34CF} + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {05C75041-D67D-4903-A362-8395A7B35C75} = {05C75041-D67D-4903-A362-8395A7B35C75} {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} = {0E231FB1-F3C9-4724-ACCB-DE8BCB3C089E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VideoSoftware", "Plugins\Plugin_VideoSoftware\Plugin_VideoSoftware.vcxproj", "{9E9DA440-E9AD-413C-B648-91030E792211}" + ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "InputCommon", "Core\InputCommon\InputCommon.vcxproj", "{B39AC394-5DB5-4DA9-9D98-09D46CA3701F}" ProjectSection(ProjectDependencies) = postProject + {69F00340-5C3D-449F-9A80-958435C6CF06} = {69F00340-5C3D-449F-9A80-958435C6CF06} {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} = {C87A4178-44F6-49B2-B7AA-C79AF1B8C534} EndProjectSection EndProject @@ -139,6 +177,18 @@ Global {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|Win32.Build.0 = Release|Win32 {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|x64.ActiveCfg = Release|x64 {C87A4178-44F6-49B2-B7AA-C79AF1B8C534}.Release|x64.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|Win32.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Debug|x64.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|Win32.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.DebugFast|x64.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|Win32.Build.0 = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.ActiveCfg = Release|x64 + {69F00340-5C3D-449F-9A80-958435C6CF06}.Release|x64.Build.0 = Release|x64 {37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|Win32.ActiveCfg = Debug|Win32 {37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|Win32.Build.0 = Debug|Win32 {37D007BD-D66C-4EAF-B56C-BD1AAC340A05}.Debug|x64.ActiveCfg = Debug|x64