From 4798524b754bc4816c0d8525473e84f3dba28b3a Mon Sep 17 00:00:00 2001 From: NeoBrainX Date: Sat, 22 Dec 2012 12:51:01 +0100 Subject: [PATCH] Dolphin 3.5 release. --- CMakeLists.txt | 14 +++++++------- Data/cpack_package_description.txt | 1 + Readme.txt | 21 ++++++++++++--------- Source/Core/DolphinWX/CMakeLists.txt | 2 ++ 4 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 Data/cpack_package_description.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 37e4f14f5e..a4f8e21437 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ if (APPLE) endif() project(dolphin-emu) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/CMakeTests) -set(DOLPHIN_IS_STABLE FALSE) +set(DOLPHIN_IS_STABLE TRUE) # Set up paths if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin")) @@ -86,7 +86,7 @@ endif() # version number set(DOLPHIN_VERSION_MAJOR "3") -set(DOLPHIN_VERSION_MINOR "0") +set(DOLPHIN_VERSION_MINOR "5") if(DOLPHIN_IS_STABLE) set(DOLPHIN_VERSION_PATCH "0") else() @@ -581,7 +581,6 @@ file(WRITE ${PROJECT_BINARY_DIR}/Source/Core/Common/Src/scmrev.h ) include_directories("${PROJECT_BINARY_DIR}/Source/Core/Common/Src") - ######################################## # Optional Targets # TODO: Add DSPSpy and TestSuite. @@ -617,19 +616,20 @@ set(CPACK_PACKAGE_VENDOR "Dolphin Team") set(CPACK_PACKAGE_VERSION_MAJOR ${DOLPHIN_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${DOLPHIN_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${DOLPHIN_VERSION_PATCH}) +set(CPACK_PACKAGE_DESCRIPTION_FILE ${PROJECT_SOURCE_DIR}/Data/cpack_package_description.txt) +set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A Gamecube, Wii and Triforce emulator") -# TODO: CPACK_PACKAGE_DESCRIPTION_FILE -# TODO: CPACK_PACKAGE_DESCRIPTION_SUMMARY +set(CPACK_RPM_PACKAGE_GROUP System/Emulators/Other) +set(CPACK_RPM_PACKAGE_LICENSE GPL-2.0) # TODO: CPACK_RESOURCE_FILE_README # TODO: CPACK_RESOURCE_FILE_WELCOME -# TODO: CPACK_PACKAGE_EXECUTABLES # TODO: CPACK_PACKAGE_ICON # TODO: CPACK_NSIS_* # TODO: Use CPack components for DSPSpy, etc => cpack_add_component set(CPACK_SET_DESTDIR ON) set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2;ZIP") -set(CPACK_SOURCE_IGNORE_FILES "\\\\.#;/#;.*~;\\\\.swp;/\\\\.svn") +set(CPACK_SOURCE_IGNORE_FILES "\\\\.#;/#;.*~;\\\\.swp;/\\\\.git") list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}") # CPack must be included after the CPACK_* variables are set in order for those diff --git a/Data/cpack_package_description.txt b/Data/cpack_package_description.txt new file mode 100644 index 0000000000..318774314d --- /dev/null +++ b/Data/cpack_package_description.txt @@ -0,0 +1 @@ +Dolphin is a Gamecube, Wii and Triforce (the arcade machine based on the Gamecube) emulator which supports many extra features and abilities not present on the original consoles. Gamecube and Wii compatibility is good - one can expect "mainstream" titles to run; lesser known titles can be hit or miss. Triforce compatibility is currently limited to a couple of games - others require more of the Triforce-specific peripheral devices to be emulated. diff --git a/Readme.txt b/Readme.txt index a00bf2a4c2..e23d0e0ec1 100644 --- a/Readme.txt +++ b/Readme.txt @@ -14,13 +14,14 @@ Team members: http://code.google.com/p/dolphin-emu/people/ Please read the FAQ before use: -http://code.google.com/p/dolphin-emu/wiki/Facts_And_Questions +http://dolphin-emu.org/docs/faq/ System Requirements: -* OS: Microsoft Windows (XP/Vista or higher) or Linux or Apple Mac OS X. +* OS: Microsoft Windows (XP/Vista or higher) or Linux or Apple Mac OS X (10.6 or higher). + Windows XP x64 is NOT supported. * Processor: Fast CPU with SSE2 supported (recommended at least 2Ghz). Dual Core for speed boost. -* Graphics: Any graphics card that supports Direct3D 9 or OpenGL 2.1. +* Graphics: Any reasonably modern graphics card (Direct3D9/OpenGL 2.1, shader model 3.0). [Command line usage] Usage: Dolphin [-h] [-d] [-l] [-e ] [-b] [-V ] [-A ] @@ -30,20 +31,22 @@ Usage: Dolphin [-h] [-d] [-l] [-e ] [-b] [-V ] [-A ] -e, --exec= Loads the specified file (DOL,ELF,WAD,GCM,ISO) -b, --batch Exit Dolphin with emulator -V, --video_backend= Specify a video plugin - -A, --audio_emulation= Low level (LLE) or high level (HLE) audio + -A, --audio_emulation= Low level (LLE) or high level (HLE) audio [Libraries] Cg: Cg Shading API (http://developer.nvidia.com/object/cg_toolkit.html) *.pdb = Program Debug Database (use these symbols with a program debugger) -[DSP Plugins] -Plugin_DSP_HLE: High Level DSP Emulation -Plugin_DSP_LLE: Low Level DSP Emulation +[DSP Emulator Engines] +HLE: High Level DSP Emulation +LLE: Low Level DSP Emulation (requires DSP dumps) + Recompiler is faster than interpreter but may be buggy. [Video Backends] Direct3D9: Render with Direct3D 9 Direct3D11: Render with Direct3D 11 OpenGL: Render with OpenGL + Cg Shader Language +Software Renderer: Render using the CPU only (for devs only) [Sys Files] totaldb.dsy: Database of symbols (for devs only) @@ -54,9 +57,9 @@ setting-usa/jpn/usa.txt: config files for Wii Cache: used to cache the ISO list Config: emulator configuration files Dump: anything dumped from dolphin will go here -GC: Gamecube memory cards GameConfig: holds the INI game config files -Load: high resolution textures +GC: Gamecube memory cards +Load: custom textures Logs: logs go here Maps: symbol tables go here (dev only) OpenCL: OpenCL code diff --git a/Source/Core/DolphinWX/CMakeLists.txt b/Source/Core/DolphinWX/CMakeLists.txt index d03cf7c6b1..f72b200ed9 100644 --- a/Source/Core/DolphinWX/CMakeLists.txt +++ b/Source/Core/DolphinWX/CMakeLists.txt @@ -196,3 +196,5 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") else() install(TARGETS ${DOLPHIN_EXE} RUNTIME DESTINATION ${bindir}) endif() + +set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} ${DOLPHIN_EXE})