Merge branch 'master' of https://github.com/dolphin-emu/dolphin

Author: ElGHT

.editorconfig

@@ -0,0 +1,33 @@
+root = true
+
+[*]
+charset = utf-8
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.{c,cpp,h,java}]
+indent_style = space
+insert_final_newline = true
+max_line_length = 100
+
+[{CMakeLists.txt,*.cmake}]
+indent_style = tab
+
+[.editorconfig]
+insert_final_newline = true
+
+[*.gradle]
+indent_size = 4
+indent_style = space
+insert_final_newline = false
+
+[*.xml]
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+
+[*.{kt,kts}]
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+max_line_length = 100

.git-blame-ignore-revs

@@ -0,0 +1,67 @@
+# This file can be used for git blame using --ignore-revs-file
+# or by setting blame.ignoreRevsFile in the git config.
+
+# Remove unnecessary Src/ folders
+34692ab826abc8f8faa61bdb2280b742424528f1
+
+# Reformat C++ code
+3570c7f03a2aa90aa634f96c0af1969af610f14d
+
+# Reformat Android code
+248ee12aed057acd0bdd310359c328e8d4fd5e5a
+
+# Enum and struct indentation cleanup
+40182a48a56b8e294e126c64f5f37910a40c67cd
+ebb48d019eec1c29a37a406e2db16d7565367faa
+
+# SVN line-ending conversion
+30c883bcfc65761dc9fb61fea16a25fb61a7e220
+3b36e0657140a8f54729f55f94ad108547362ed5
+473cd01181be6c8160ce477f25ca6bd39f8cc083
+49cfded60bb5b444d1828190eacc52bbb49a9cb8
+4a0c8fc0c9b6666e7933683260e2befbc81917ff
+4b5b9ad05c10d95c9af43502ecc6877d6e680c4d
+4b68a543ba30ec18e79c93b742bc6f110ccd4561
+4f889ca1a3cb66ff78f11aa6864edf8ce51b8c93
+578c402d2ce5e6a7b6e42a4c7449d9aeac61e5e2
+5e81298ef0147bf36c4aaafa35accc2700777bd3
+7efbc879e544cba7f205b3eeaeff050f46fd9607
+7f4ebed1ddb7ca9aaa49172946fc1f7dc2dc3c75
+8151b21ec75107b73a5863177f29d6f69b7174fc
+8fca9a8e8d547653581ecb4aac12a09a4311eba3
+901fe7c00fec5e2aaf55d184edbcb6d092345d52
+90bac5731cc4b15f40be9cf3a51a2c88ca6b53bf
+9146b9b261c34f476c9f83934e6da6a463ad51c7
+a41c1b2d0a9fab51f8a75ccdb7dba0890f766820
+a524cecfabbd4e321485e0cbac9325efde2123ef
+ab76cbf2fcf31b059edf10c220800150313ddf18
+bbb98d8e2e8259213cc231041eba922471555eb9
+e6fe5ec42f025a710918c1aaf8643da36a13bb3e
+fc1c7c31a08d55be4c756a1ed599d6afeedd9a11
+
+# Trailing whitespace
+c579637eafb9e9eb7f83711569254bd8da6d09d2
+664c8d30a055f4762a2a60be77c1c8eaec1a5d85
+84ae817c180556badd1a810fceff4c4168672541
+8da425b008b46ef90d649e55c6c0d4a0bc2b556b
+8f7c6286f4d4b3e1dccc7076012fe6e593e78c8b
+
+# Additional reformatting
+40bb9974f21878e64fb03d70e717cb996bf13a29
+
+# Tabs vs spaces
+0e3d8e2e9f1b3eab593b09be986c4ff12a0221e2
+16a74a9557779cd15890b0a3bb2924cb4b00ad6f
+1db10b139cb1f9b92b2e90eb86f236dcd30333b4
+1de39a4a6e6b5ef3ec55bd717d4ba02c02ff8d29
+2316cb6876e6d79584ce0cc50771d2fb8495fe45
+2d4c3c7c918877c844babaa5ac4c23f8a441fb64
+31f037b187525d72c10b83695f780ede1ad9db68
+3c6d0fc7106131098fe1a79d2deb0f39671c5252
+3fd87a7636ff434118a5d7f7334550be8db55c0b
+71ef0a02451393b32fc2304008f87d5b29b61444
+7ab0cca6455830a838b1b1e38e2c3f265e4e5d0b
+d800b5fb74c077522ef7a0752e49968df46e745e
+edd9d0e0ef6898a0528ac6389e93e9fca6132ff6
+ee61bd6f2e4db8df8e92be6f92c02b808aa92234
+ef85b9af45922c6ca364930d40f8aacf1a6dfe64

.gitattributes

@@ -0,0 +1 @@
+*.sln text eol=crlf

.gitignore

@@ -3,12 +3,16 @@ Thumbs.db
 # Ignore Finder view option files created by OS X
 .DS_Store
 # Ignore autogenerated source files
+Externals/mGBA/version.c
 Source/Core/Common/scmrev.h
 # Ignore files output by build
+/cmake-build-debug
+/cmake-build-release
 /[Bb]uild*/
-/[Bb]inary/
+/[Bb]inary*/
 /obj/
-# Android cmake builds to here then copies to Source/Android.
+# Ignore files output by Android cmake build
+/Source/Android/app/.cxx/
 /libs/
 # Ignore various files created by visual studio/msbuild
 *.ipch
@@ -20,7 +24,8 @@ Source/Core/Common/scmrev.h
 *.tlog
 *.VC.opendb
 *.VC.db
-.vs/
+.vs*/
+/Source/enc_temp_folder/
 # Ignore build info file created by QtCreator
 CMakeLists.txt.user
 # Ignore files created by posix people
@@ -30,9 +35,11 @@ CMakeLists.txt.user
 # Ignore emacs temp files
 \#*\#
 .\#*
-# Ignore transifex configuration directory
-.tx
 # Ignore kdevelop files/dirs
 *.kdev4
 # Ignore IDEA/Clion files/dirs
-/.idea/
+.idea/
+# Ignore Visual Studio Code's working dir
+/.vscode/
+# Ignore flatpak-builder's cache dir
+.flatpak-builder

.gitmodules

@@ -1,4 +1,132 @@
 [submodule "Externals/Qt"]
 	path = Externals/Qt
 	url = https://github.com/dolphin-emu/ext-win-qt.git
-	branch = master
+	shallow = true
+[submodule "Externals/mGBA/mgba"]
+	path = Externals/mGBA/mgba
+	url = https://github.com/mgba-emu/mgba.git
+	shallow = true
+[submodule "Externals/FFmpeg-bin"]
+	path = Externals/FFmpeg-bin
+	url = https://github.com/dolphin-emu/ext-win-ffmpeg.git
+	shallow = true
+[submodule "libusb"]
+	path = Externals/libusb/libusb
+	url = https://github.com/libusb/libusb.git
+	shallow = true
+[submodule "Externals/spirv_cross/SPIRV-Cross"]
+	path = Externals/spirv_cross/SPIRV-Cross
+	url = https://github.com/KhronosGroup/SPIRV-Cross.git
+	shallow = true
+[submodule "SDL"]
+	path = Externals/SDL/SDL
+	url = https://github.com/libsdl-org/SDL.git
+	shallow = true
+[submodule "Externals/zlib-ng/zlib-ng"]
+	path = Externals/zlib-ng/zlib-ng
+	url = https://github.com/zlib-ng/zlib-ng.git
+	shallow = true
+[submodule "Externals/libspng/libspng"]
+	path = Externals/libspng/libspng
+	url = https://github.com/randy408/libspng.git
+	shallow = true
+[submodule "Externals/VulkanMemoryAllocator"]
+	path = Externals/VulkanMemoryAllocator
+	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
+	shallow = true
+[submodule "Externals/cubeb/cubeb"]
+	path = Externals/cubeb/cubeb
+	url = https://github.com/mozilla/cubeb.git
+	shallow = true
+[submodule "Externals/implot/implot"]
+	path = Externals/implot/implot
+	url = https://github.com/epezent/implot.git
+	shallow = true
+[submodule "Externals/gtest"]
+	path = Externals/gtest
+	url = https://github.com/google/googletest.git
+	shallow = true
+[submodule "Externals/rcheevos/rcheevos"]
+	path = Externals/rcheevos/rcheevos
+	url = https://github.com/RetroAchievements/rcheevos.git
+	shallow = true
+[submodule "Externals/libadrenotools"]
+	path = Externals/libadrenotools
+	url = https://github.com/bylaws/libadrenotools.git
+	shallow = true
+[submodule "Externals/curl/curl"]
+	path = Externals/curl/curl
+	url = https://github.com/curl/curl.git
+	shallow = true
+[submodule "Externals/fmt/fmt"]
+	path = Externals/fmt/fmt
+	url = https://github.com/fmtlib/fmt.git
+	shallow = true
+[submodule "Externals/lz4/lz4"]
+	path = Externals/lz4/lz4
+	url = https://github.com/lz4/lz4.git
+	shallow = true
+[submodule "Externals/xxhash/xxHash"]
+	path = Externals/xxhash/xxHash
+	url = https://github.com/Cyan4973/xxHash.git
+	shallow = true
+[submodule "Externals/enet/enet"]
+	path = Externals/enet/enet
+	url = https://github.com/lsalzman/enet.git
+	shallow = true
+[submodule "hidapi-src"]
+	path = Externals/hidapi/hidapi-src
+	url = https://github.com/libusb/hidapi.git
+	shallow = true
+[submodule "Externals/tinygltf/tinygltf"]
+	path = Externals/tinygltf/tinygltf
+	url = https://github.com/syoyo/tinygltf.git
+	shallow = true
+[submodule "Externals/minizip-ng/minizip-ng"]
+	path = Externals/minizip-ng/minizip-ng
+	url = https://github.com/zlib-ng/minizip-ng.git
+	shallow = true
+[submodule "Externals/Vulkan-Headers"]
+	path = Externals/Vulkan-Headers
+	url = https://github.com/KhronosGroup/Vulkan-Headers.git
+	shallow = true
+[submodule "Externals/watcher/watcher"]
+	path = Externals/watcher/watcher
+	url = https://github.com/e-dant/watcher.git
+	shallow = true
+[submodule "Externals/SFML/SFML"]
+	path = Externals/SFML/SFML
+	url = https://github.com/SFML/SFML.git
+	shallow = true
+[submodule "Externals/zstd/zstd"]
+	path = Externals/zstd/zstd
+	url = https://github.com/facebook/zstd.git
+	shallow = true
+[submodule "Externals/miniupnpc/miniupnp"]
+	path = Externals/miniupnpc/miniupnp
+	url = https://github.com/miniupnp/miniupnp.git
+	shallow = true
+[submodule "Externals/glslang/glslang"]
+	path = Externals/glslang/glslang
+	url = https://github.com/KhronosGroup/glslang.git
+	shallow = true
+[submodule "Externals/pugixml/pugixml"]
+	path = Externals/pugixml/pugixml
+	url = https://github.com/zeux/pugixml.git
+	shallow = true
+[submodule "Externals/cpp-ipc/cpp-ipc"]
+	path = Externals/cpp-ipc/cpp-ipc
+	url = https://github.com/mutouyun/cpp-ipc.git
+	shallow = true
+[submodule "Externals/cpp-optparse/cpp-optparse"]
+	path = Externals/cpp-optparse/cpp-optparse
+	url = https://github.com/weisslj/cpp-optparse.git
+	shallow = true
+[submodule "Externals/bzip2/bzip2"]
+	path = Externals/bzip2/bzip2
+	url = https://gitlab.com/bzip2/bzip2.git
+	shallow = true
+[submodule "Externals/imgui/imgui"]
+	path = Externals/imgui/imgui
+	url = https://github.com/ocornut/imgui.git
+	shallow = true

.tx/config

@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[o:dolphinemu:p:dolphin-emu:r:emulator]
+file_filter = Languages/po/<lang>.po
+source_file = Languages/po/dolphin-emu.pot
+source_lang = en-US
+type        = PO

AndroidSetup.md

@@ -4,65 +4,31 @@ If you'd like to contribute to the Android project, but do not currently have a
 
 ## Prerequisites
 
-* A Linux VM or host, or a Mac.
-* JDK 7 for your platform.
-* CMake
-* [Android NDK](https://developer.android.com/tools/sdk/ndk/index.html) 
-* [Android Studio](http://developer.android.com/tools/studio/index.html) **OR**
-* [Android SDK Tools](http://developer.android.com/sdk/index.html#Other) (for command-line usage)
+* [Android Studio](https://developer.android.com/studio/)
 
-If you downloaded Android Studio, extract it and then see [Setting up Android Studio](#setting-up-android-studio).
+Install Android Studio with the default options if you do not already have it.
 
-If you instead chose to download the commoand-line SDK tools, see [Setting up the SDK Tools](#setting-up-the-sdk-tools).
+## Setting Up Android Studio
 
-## Setting up Android Studio
+1. Open the `Source/Android` project in Android Studio, let any background tasks finish, and Android Studio will automatically download the required SDK components and tooling.
+2. Use the hammer icon or **Build > Assemble 'app' Run Configuration** to compile the `:app` module, then choose **Build > Generate App Bundles or APKs > Generate APKs** to produce the APK in `Source/Android/app/build/outputs/apk`.
 
-1. Launch Android Studio, which will start a first-launch wizard.
-2. Choose a custom installation.
-3. If offered a choice of themes, select your preference.
-4. When offered a choice of components, uncheck the "Android Virtual Device" option. ![Android Studio Components][components]
-5. Accept all licenses, and click Finish. Android Studio will download the SDK Tools package automatically. (Ubuntu users, if you get an error running the `mksdcard` tool, make sure the `lib32stdc++6` package is installed.)
-6. At the Android Studio welcome screen, click "Configure", then "SDK Manager".
-7. Use the SDK Manager to get necessary dependencies, as described in [Getting Dependencies](#getting-dependencies).
-8. When done, follow the steps in [Readme.md](Readme.md#installation-on-android) to compile and deploy the application.
+## Import the Dolphin code style
 
-## Setting up the SDK Tools
+The project maintains a custom IntelliJ/Android Studio style file to keep Java and Kotlin formatting consistent.
 
-1. In `Source/Android`, create a file called `local.properties`.
-2. Add a single line: `sdk.dir=<sdk-path>`, where `<sdk-path>` is the path where you extracted the SDK Tools package.
-3. Follow the steps in [Readme.md](Readme.md#installation-on-android) to compile and deploy the application.
+* Go to **File > Settings > Editor > Code Style** (or **Android Studio > Settings > Editor > Code Style** on macOS).
+* Click the gear icon and choose **Import Scheme**.
+* Select `Source/Android/code-style-java.xml` from the repository.
+* Ensure that Dolphin-Java is selected.
 
-## Executing Gradle Tasks
+## Format code before opening a pull request
 
-In Android Studio, you can find a list of possible Gradle tasks in a tray at the top right of the screen:
+Before committing or submitting a pull request, reformat any Java or Kotlin files you modified:
 
-![Gradle Tasks][gradle]
+* Use **Code > Reformat Code** (or press `Ctrl+Alt+L`/`⌥⌘L` on macOS) with the Dolphin code style selected.
+* Re-run formatting after edits to keep spacing, imports, and wrapping consistent with the rest of the project.
 
-Double clicking any of these tasks will execute it, and also add it to a short list in the main toolbar:
+## Compiling from the Command-Line
 
-![Gradle Task Shortcuts][shortcut]
-
-Clicking the green triangle next to this list will execute the currently selected task.
-
-For command-line users, any task may be executed with `Source/Android/gradlew <task-name>`.
-
-## Getting Dependencies
-
-Most dependencies for the Android project are supplied by Gradle automatically. However, Android platform libraries (and a few Google-supplied supplementary libraries) must be downloaded through the Android package manager.
-
-1. Launch the Android SDK Manager from the commandline by executing `<sdk-path>/tools/android`, or by clicking on its icon in Android Studio's main toolbar:
-![Android Studio Package Icon][package-icon]
-2. At the bottom of the window, click "Deselect All", and then "Updates".
-3. Install or update the following packages:
-
-* SDK Platform, under "Android 5.0.1 (API 21)". This will allow compiling apps that target Lollipop.
-* Android Support Repository
-* Android Support Library
-* Google Repository
-
-In the future, if the project targets a newer version of Android, or use newer versions of the tools/build-tools packages, it will be necessary to use this tool to download updates.
-
-[components]: http://i.imgur.com/Oo1Fs93.png
-[package-icon]: http://i.imgur.com/NUpkAH8.png
-[gradle]: http://i.imgur.com/dXIH6o3.png
-[shortcut]: http://i.imgur.com/eCWP4Yy.png
+For command-line users, any task may be executed with `cd Source/Android` followed by `gradlew <task-name>`. In particular, `gradlew assemble` builds debug and release versions of the application (which are placed in `Source/Android/app/build/outputs/apk`).