mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
LunaMoo
d60b332536
Merge branch 'master' into TemporaryHackishBranch # Conflicts: # CMakeLists.txt # Common/UI/Context.cpp # Core/Config.cpp # GPU/D3D11/TextureCacheD3D11.cpp # GPU/Directx9/TextureCacheDX9.cpp # GPU/GLES/TextureCacheGLES.cpp # GPU/Vulkan/TextureCacheVulkan.cpp # README.md # UI/GameSettingsScreen.cpp # UI/MainScreen.cpp # UI/NativeApp.cpp # android/assets/ui_atlas.meta # android/assets/ui_atlas.zim # assets/ui_atlas.meta # assets/ui_atlas.zim
44 lines
1.4 KiB
Plaintext
44 lines
1.4 KiB
Plaintext
[submodule "pspautotests"]
|
|
path = pspautotests
|
|
url = https://github.com/hrydgard/pspautotests.git
|
|
[submodule "ffmpeg"]
|
|
path = ffmpeg
|
|
url = https://github.com/hrydgard/ppsspp-ffmpeg.git
|
|
[submodule "dx9sdk"]
|
|
path = dx9sdk
|
|
url = https://github.com/hrydgard/minidx9.git
|
|
[submodule "ext/armips"]
|
|
path = ext/armips
|
|
url = https://github.com/Kingcom/armips.git
|
|
[submodule "ext/glslang"]
|
|
path = ext/glslang
|
|
url = https://github.com/hrydgard/glslang.git
|
|
[submodule "ext/SPIRV-Cross"]
|
|
path = ext/SPIRV-Cross
|
|
url = https://github.com/KhronosGroup/SPIRV-Cross.git
|
|
[submodule "assets/patches"]
|
|
path = assets/patches
|
|
url = https://github.com/LunaMoo/PPSSPP_workarounds.git
|
|
[submodule "ext/discord-rpc"]
|
|
path = ext/discord-rpc
|
|
url = https://github.com/discordapp/discord-rpc.git
|
|
[submodule "ext/rapidjson"]
|
|
path = ext/rapidjson
|
|
url = https://github.com/Tencent/rapidjson.git
|
|
[submodule "ext/native/tools/prebuilt"]
|
|
path = ext/native/tools/prebuilt
|
|
url = https://github.com/hrydgard/ppsspp-freetype.git
|
|
[submodule "ext/miniupnp"]
|
|
path = ext/miniupnp
|
|
url = https://github.com/hrydgard/miniupnp.git
|
|
[submodule "zstd"]
|
|
path = ext/zstd
|
|
url = https://github.com/facebook/zstd.git
|
|
[submodule "SDL/macOS"]
|
|
path = SDL/macOS
|
|
url = https://github.com/hrydgard/ppsspp-mac-sdl
|
|
[submodule "ppsspp-debugger"]
|
|
path = assets/debugger
|
|
url = https://github.com/unknownbrackets/ppsspp-debugger.git
|
|
branch = bundled
|