Merge pull request ProjectRio#85 from ProjectRio/2.1.0_mainline

2.1.0 mainline

.gitmodules

@@ -60,3 +60,18 @@
 [submodule "Externals/curl/curl"]
 	path = Externals/curl/curl
 	url = https://github.com/curl/curl.git
+[submodule "Externals/fmt/fmt"]
+	path = Externals/fmt/fmt
+	url = https://github.com/fmtlib/fmt.git
+[submodule "Externals/lz4/lz4"]
+	path = Externals/lz4/lz4
+	url = https://github.com/lz4/lz4
+[submodule "Externals/xxhash/xxHash"]
+	path = Externals/xxhash/xxHash
+	url = https://github.com/Cyan4973/xxHash.git
+[submodule "Externals/enet/enet"]
+	path = Externals/enet/enet
+	url = https://github.com/lsalzman/enet.git
+[submodule "hidapi-src"]
+	path = Externals/hidapi/hidapi-src
+	url = https://github.com/libusb/hidapi

CMakeLists.txt

@@ -124,8 +124,8 @@ option(OPROFILING "Enable profiling" OFF)
 # TODO: Add DSPSpy
 option(DSPTOOL "Build dsptool" OFF)
 
-# Enable SDL for default on operating systems that aren't Android or Linux.
-if(NOT ANDROID AND NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
+# Enable SDL by default on operating systems that aren't Android.
+if(NOT ANDROID)
   option(ENABLE_SDL "Enables SDL as a generic controller backend" ON)
 else()
   option(ENABLE_SDL "Enables SDL as a generic controller backend" OFF)
@@ -219,9 +219,7 @@ if(ENABLE_GENERIC)
   set(_M_GENERIC 1)
   add_definitions(-D_M_GENERIC=1)
 elseif(_ARCH_64 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
-  set(_M_X86 1)
   set(_M_X86_64 1)
-  add_definitions(-D_M_X86=1)
   add_definitions(-D_M_X86_64=1)
   check_and_add_flag(HAVE_SSE2 -msse2)
 elseif(_ARCH_64 AND CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64")
@@ -589,7 +587,7 @@ if(UNIX)
 endif()
 
 if(ENABLE_SDL)
-  dolphin_find_optional_system_library(SDL2 Externals/SDL)
+  dolphin_find_optional_system_library(SDL2 Externals/SDL 2.26.0)
 endif()
 
 if(ENABLE_ANALYTICS)
@@ -625,12 +623,12 @@ endif()
 #   - place the CMakeLists.txt in the first-level subdirectory, e.g.
 #     Externals/zlib/CMakeLists.txt (that is: NOT in some Src/ subdirectory)
 #
-if (_M_X86)
+if (_M_X86_64)
   add_subdirectory(Externals/Bochs_disasm)
 endif()
 add_subdirectory(Externals/cpp-optparse)
 
-dolphin_find_optional_system_library(fmt Externals/fmt 8)
+dolphin_find_optional_system_library(fmt Externals/fmt 10.1)
 
 add_subdirectory(Externals/imgui)
 add_subdirectory(Externals/implot)
@@ -661,12 +659,9 @@ endif()
 
 dolphin_find_optional_system_library(pugixml Externals/pugixml)
 
-dolphin_find_optional_system_library_pkgconfig(ENET libenet>=1.3.8 enet::enet Externals/enet)
+dolphin_find_optional_system_library_pkgconfig(ENET libenet>=1.3.18 enet::enet Externals/enet)
 
-if(NOT XXHASH_FOUND)
-  message(STATUS "Using static xxhash from Externals")
-  add_subdirectory(Externals/xxhash)
-endif()
+dolphin_find_optional_system_library_pkgconfig(xxhash libxxhash>=0.8.2 xxhash::xxhash Externals/xxhash)
 
 dolphin_find_optional_system_library(BZip2 Externals/bzip2)
 
@@ -682,6 +677,8 @@ dolphin_find_optional_system_library_pkgconfig(MINIZIP minizip>=3.0.0 minizip::m
 
 dolphin_find_optional_system_library(LZO Externals/LZO)
 
+dolphin_find_optional_system_library_pkgconfig(lz4 liblz4>=1.8 LZ4::LZ4 Externals/lz4)
+
 dolphin_find_optional_system_library_pkgconfig(SPNG spng spng::spng Externals/libspng)
 
 # Using static FreeSurround from Externals
@@ -790,7 +787,7 @@ if(NOT GIT_FOUND)
 endif()
 add_custom_target(
 	dolphin_scmrev
-	${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} -DDISTRIBUTOR=${DISTRIBUTOR} -DDOLPHIN_DEFAULT_UPDATE_TRACK=${DOLPHIN_DEFAULT_UPDATE_TRACK} -DGIT_FOUND=${GIT_FOUND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -P ${CMAKE_SOURCE_DIR}/CMake/ScmRevGen.cmake
+	${CMAKE_COMMAND} -DPROJECT_SOURCE_DIR=${PROJECT_SOURCE_DIR} -DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR} -DDISTRIBUTOR=${DISTRIBUTOR} -DDOLPHIN_DEFAULT_UPDATE_TRACK=${DOLPHIN_DEFAULT_UPDATE_TRACK} -DGIT_FOUND=${GIT_FOUND} -DGIT_EXECUTABLE=${GIT_EXECUTABLE} -DDOLPHIN_WC_REVISION=${DOLPHIN_WC_REVISION} -DDOLPHIN_WC_DESCRIBE=${DOLPHIN_WC_DESCRIBE} -DDOLPHIN_WC_BRANCH=${DOLPHIN_WC_BRANCH} -P ${CMAKE_SOURCE_DIR}/CMake/ScmRevGen.cmake
 	BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/Source/Core/Common/scmrev.h
 	VERBATIM
 )

Contributing.md

@@ -1,17 +1,32 @@
-# <a name="main-heading"></a>Dolphin Coding Style & Licensing
+# <a name="main-section-overview"></a>Dolphin Coding Style & Legal Requirements
 
-If you make any contributions to Dolphin after December 1st, 2014, you are agreeing that any code you have contributed will be licensed under the GNU GPL version 2 (or any later version).
-
-# <a name="main-section-overview"></a>Main sections
-
-- [Introduction](#introduction)
+- [Legal](#legal)
+- [Coding style introduction](#introduction)
 - [C++ coding style and formatting](#cpp-coding-style-and-formatting)
 - [C++ code-specific guidelines](#cpp-code-specific-guidelines)
 - [Android](#android)
 - [Help](#help)
 
+# <a name="legal"></a>Legal
+
+Summary:
+
+- [Trade secrets](#trade-secrets)
+- [Code licensing](#code-licensing)
+
+## <a name="trade-secrets"></a>Trade secrets
+
+Following all relevant laws is of utmost importance for an emulation project like Dolphin.
+
+If you know any confidential information related to the GameCube, Wii, or Triforce, either because you signed a non-disclosure agreement or because you looked at leaked materials, we ask that you don't contribute code to Dolphin **at all**. While accepting code from contributors who know confidential information is legal if the code is unrelated to the confidential information, we refuse to accept code from such contributors because it greatly increases our review burden and increases the legal risk we take.
+
+Also, this probably goes without saying, but piracy is strictly forbidden both on GitHub and in all other Dolphin channels.
+
+## <a name="code-licensing"></a>Code licensing
+
+If you make any contributions to Dolphin after December 1st, 2014, you are agreeing that any code you have contributed will be licensed under the GNU GPL version 2 (or any later version).
 
-# <a name="introduction"></a>Introduction
+# <a name="introduction"></a>Coding style introduction
 
 Summary:
 

Data/Sys/GameSettings/G2BE5G.ini

@@ -0,0 +1,16 @@
+# G2BE5G - Black & Bruised
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+$Disable interlaced rendering
+0x800D8520:dword:0x38600000
+
+[ActionReplay]
+# Add action replay cheats here.
+

Data/Sys/GameSettings/G2BP7D.ini

@@ -0,0 +1,16 @@
+# G2BP7D - Black & Bruised
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+$Disable interlaced rendering
+0x800D9E68:dword:0x38600000
+
+[ActionReplay]
+# Add action replay cheats here.
+

Data/Sys/GameSettings/GC8JA4.ini

@@ -0,0 +1,24 @@
+# GC8JA4 - ｸﾗｯｼｭ･ﾊﾞﾝﾃﾞｨｸｰ 爆走！ニトロカート
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+$Fix C4 texture tiling (used for buttons and some character icons)
+0400328C 7D0340AE
+04003290 5108452E
+04003294 5508E13E
+04003298 4E800020
+040CA1B4 4BF390D9
+
+[Video_Settings]
+
+[Video_Hacks]
+ImmediateXFBEnable = False

Data/Sys/GameSettings/HAJ.ini

@@ -0,0 +1,9 @@
+# HAJE01, HAJJ01, HAPP01 - Everybody Votes Channel
+
+[WC24Patch]
+$Main
+vt.wapp.wii.com:vt.wiilink24.com:1
+vtp.wapp.wii.com:vtp.wiilink24.com:0
+
+[WC24Patch_Enabled]
+$Main

Data/Sys/GameSettings/HAL.ini

@@ -0,0 +1,19 @@
+# HALE01, HALJ01, HALP01 - Region Select
+
+[OnFrame_Enabled]
+$RSAPatch
+
+[OnFrame]
+# This patch changes the flag in its nwc24dl.bin to not have an RSA signature.
+# Although Dolphin doesn't validate the RSA signature, a real Wii does which is why we added this workaround.
+$RSAPatch
+0x80009DEC:dword:0x60000000
+0x8001AB20:dword:0x38600001
+0x8001AC68:dword:0x38600001
+
+[WC24Patch]
+$Main
+cfh.wapp.wii.com:ch.wiilink24.com:1
+
+[WC24Patch_Enabled]
+$Main

Data/Sys/GameSettings/RJ3.ini

@@ -0,0 +1,17 @@
+# RJ3E20, RJ3P7J - Jeep Thrills
+
+[Core]
+# Values set here will override the main Dolphin settings.
+# Fixes the blue screen problem. See issue 13118 for more info.
+AccurateNaNs = True
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Settings]

Data/Sys/GameSettings/SGLPA4.ini

@@ -0,0 +1,8 @@
+# SGLPA4 - Gormiti: The Lords of Nature!
+
+[OnFrame]
+# Fixes black screen ingame, see https://bugs.dolphin-emu.org/issues/12436
+# This NOPs out UpdateFade's call to RenderFade. We are probably emulating the way the fade works
+# incorrectly, but for now this patch makes the game playable.
+$Fix black screen
+0x801D59C8:dword:0x60000000

Data/Sys/GameSettings/SRQ.ini

@@ -0,0 +1,17 @@
+# SRQE41, SRQP41 - Racquet Sports
+
+[Core]
+# Values set here will override the main Dolphin settings.
+
+[OnLoad]
+# Add memory patches to be loaded once on boot here.
+
+[OnFrame]
+# Add memory patches to be applied every frame here.
+
+[ActionReplay]
+# Add action replay cheats here.
+
+[Video_Hacks]
+#This prevents the loading screen from running uncapped
+ImmediateXFBEnable = False

Data/Sys/Load/GraphicMods/Dragon Ball Z Budokai Tenkaichi 3/RDS.txt

@@ -0,0 +1 @@
+