mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2024-12-28 02:26:07 +00:00
Various changes
This commit is contained in:
parent
323e66f765
commit
309e90783e
4
.github/workflows/windows-qt.yml
vendored
4
.github/workflows/windows-qt.yml
vendored
|
@ -26,10 +26,10 @@ jobs:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
- name: Setup Qt
|
- name: Setup Qt
|
||||||
uses: jurplel/install-qt-action@v3
|
uses: jurplel/install-qt-action@v4
|
||||||
with:
|
with:
|
||||||
arch: win64_msvc2019_64
|
arch: win64_msvc2019_64
|
||||||
version: 6.7.0
|
version: 6.7.1
|
||||||
|
|
||||||
- name: Configure CMake
|
- name: Configure CMake
|
||||||
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
|
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
|
||||||
|
|
16
.gitmodules
vendored
16
.gitmodules
vendored
|
@ -1,19 +1,15 @@
|
||||||
[submodule "externals/discord-rpc"]
|
[submodule "externals/discord-rpc"]
|
||||||
path = externals/discord-rpc
|
path = externals/discord-rpc
|
||||||
url = https://github.com/shadps4-emu/ext-discord-rpc.git
|
url = https://github.com/shadps4-emu/ext-discord-rpc.git
|
||||||
branch = master
|
|
||||||
[submodule "externals/cryptopp-cmake"]
|
[submodule "externals/cryptopp-cmake"]
|
||||||
path = externals/cryptopp-cmake
|
path = externals/cryptopp-cmake
|
||||||
url = https://github.com/shadps4-emu/ext-cryptopp-cmake.git
|
url = https://github.com/shadps4-emu/ext-cryptopp-cmake.git
|
||||||
branch = master
|
|
||||||
[submodule "externals/cryptopp"]
|
[submodule "externals/cryptopp"]
|
||||||
path = externals/cryptopp
|
path = externals/cryptopp
|
||||||
url = https://github.com/shadps4-emu/ext-cryptopp.git
|
url = https://github.com/shadps4-emu/ext-cryptopp.git
|
||||||
branch = master
|
|
||||||
[submodule "externals/cryptoppwin"]
|
[submodule "externals/cryptoppwin"]
|
||||||
path = externals/cryptoppwin
|
path = externals/cryptoppwin
|
||||||
url = https://github.com/shadps4-emu/ext-cryptoppwin.git
|
url = https://github.com/shadps4-emu/ext-cryptoppwin.git
|
||||||
branch = main
|
|
||||||
[submodule "externals/zlib-ng"]
|
[submodule "externals/zlib-ng"]
|
||||||
path = externals/zlib-ng
|
path = externals/zlib-ng
|
||||||
url = https://github.com/shadps4-emu/ext-zlib-ng.git
|
url = https://github.com/shadps4-emu/ext-zlib-ng.git
|
||||||
|
@ -25,22 +21,22 @@
|
||||||
url = https://github.com/shadps4-emu/ext-fmt.git
|
url = https://github.com/shadps4-emu/ext-fmt.git
|
||||||
[submodule "externals/vulkan-headers"]
|
[submodule "externals/vulkan-headers"]
|
||||||
path = externals/vulkan-headers
|
path = externals/vulkan-headers
|
||||||
url = https://github.com/KhronosGroup/Vulkan-Headers
|
url = https://github.com/KhronosGroup/Vulkan-Headers.git
|
||||||
[submodule "externals/vma"]
|
[submodule "externals/vma"]
|
||||||
path = externals/vma
|
path = externals/vma
|
||||||
url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
|
url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
|
||||||
[submodule "externals/glslang"]
|
[submodule "externals/glslang"]
|
||||||
path = externals/glslang
|
path = externals/glslang
|
||||||
url = https://github.com/KhronosGroup/glslang
|
url = https://github.com/KhronosGroup/glslang.git
|
||||||
[submodule "externals/robin-map"]
|
[submodule "externals/robin-map"]
|
||||||
path = externals/robin-map
|
path = externals/robin-map
|
||||||
url = https://github.com/Tessil/robin-map
|
url = https://github.com/Tessil/robin-map.git
|
||||||
[submodule "externals/boost"]
|
[submodule "externals/boost"]
|
||||||
path = externals/boost
|
path = externals/boost
|
||||||
url = https://github.com/raphaelthegreat/ext-boost
|
url = https://github.com/raphaelthegreat/ext-boost.git
|
||||||
[submodule "externals/xbyak"]
|
[submodule "externals/xbyak"]
|
||||||
path = externals/xbyak
|
path = externals/xbyak
|
||||||
url = https://github.com/herumi/xbyak
|
url = https://github.com/herumi/xbyak.git
|
||||||
[submodule "externals/winpthreads"]
|
[submodule "externals/winpthreads"]
|
||||||
path = externals/winpthreads
|
path = externals/winpthreads
|
||||||
url = https://github.com/shadps4-emu/winpthreads.git
|
url = https://github.com/shadps4-emu/winpthreads.git
|
||||||
|
|
17
README.md
17
README.md
|
@ -7,9 +7,11 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
||||||
|
|
||||||
shadPS4 is an early PS4 emulator for Windows and Linux written in C++
|
shadPS4 is an early PS4 emulator for Windows and Linux written in C++
|
||||||
|
|
||||||
|
[![Video](http://img.youtube.com/vi/AAHoNzhHyCU/0.jpg)](https://www.youtube.com/watch?v=AAHoNzhHyCU)
|
||||||
|
|
||||||
To discuss shadPS4 development or suggest ideas, join the [Discord server](https://discord.gg/MyZRaBngxA)
|
To discuss shadPS4 development or suggest ideas, join the [Discord server](https://discord.gg/MyZRaBngxA)
|
||||||
|
|
||||||
Check us on [twitter](https://twitter.com/shadps4)
|
Check us on [X (twitter)](https://x.com/shadps4)
|
||||||
|
|
||||||
# Status
|
# Status
|
||||||
|
|
||||||
|
@ -33,8 +35,17 @@ Check building instructions in [Linux build](https://github.com/shadps4-emu/shad
|
||||||
|
|
||||||
|Platform|Build status|
|
|Platform|Build status|
|
||||||
|--------|------------|
|
|--------|------------|
|
||||||
|Windows SDL build|[![Windows-sdl](https://github.com/shadps4-emu/shadPS4/actions/workflows/windows.yml/badge.svg)](https://github.com/shadps4-emu/shadPS4/actions/workflows/windows.yml)
|
|Windows SDL Build|[![Windows-sdl](https://github.com/shadps4-emu/shadPS4/actions/workflows/windows.yml/badge.svg)](https://github.com/shadps4-emu/shadPS4/actions/workflows/windows.yml)
|
||||||
|Linux SDL build|[![Linux-sdl](https://github.com/shadps4-emu/shadPS4/actions/workflows/linux.yml/badge.svg)](https://github.com/shadps4-emu/shadPS4/actions/workflows/linux.yml)
|
|Windows Qt Build|[![Windows-qt](https://github.com/shadps4-emu/shadPS4/actions/workflows/windows-qt.yml/badge.svg)](https://github.com/shadps4-emu/shadPS4/actions/workflows/windows-qt.yml)
|
||||||
|
|Linux SDL Build|[![Linux-sdl](https://github.com/shadps4-emu/shadPS4/actions/workflows/linux.yml/badge.svg)](https://github.com/shadps4-emu/shadPS4/actions/workflows/linux.yml)
|
||||||
|
|Linux Qt Build|[![Linux-qt](https://github.com/shadps4-emu/shadPS4/actions/workflows/linux-qt.yml/badge.svg)](https://github.com/shadps4-emu/shadPS4/actions/workflows/linux-qt.yml)
|
||||||
|
|
||||||
|
# Executing a program
|
||||||
|
|
||||||
|
You can copy and paste the path to the CMD or drag the executable file to the application.
|
||||||
|
```
|
||||||
|
C:\Users\******\shadPS4.exe C:\******\game_eboot.bin
|
||||||
|
```
|
||||||
|
|
||||||
# Main team
|
# Main team
|
||||||
|
|
||||||
|
|
2
externals/glslang
vendored
2
externals/glslang
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit effcbf7893a177b756bc80bf74009a950c3073a1
|
Subproject commit 2b19bf7e1bc0b60cf2fe9d33e5ba6b37dfc1cc83
|
2
externals/magic_enum
vendored
2
externals/magic_enum
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit a2077c01c3071c12279b7ab40a19607647682d37
|
Subproject commit db0b726c051f2d631b85793038677caf467a7cfe
|
2
externals/vulkan-headers
vendored
2
externals/vulkan-headers
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 5677bafb820e476441e9e1f745371b72133407d3
|
Subproject commit 192d051db3382e213f8bd9d8048fc9eaa78ed6ab
|
2
externals/xxhash
vendored
2
externals/xxhash
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit e9455b2c204df00f31200392f96ac12197de8bf0
|
Subproject commit ac3a25da3d957d9ef3e4114d9f8332d34ce83a46
|
Binary file not shown.
Before Width: | Height: | Size: 810 KiB |
Loading…
Reference in a new issue