diff --git a/.github/workflows/linux-qt.yml b/.github/workflows/linux-qt.yml index c6e1b5cc..31f8df01 100644 --- a/.github/workflows/linux-qt.yml +++ b/.github/workflows/linux-qt.yml @@ -34,7 +34,7 @@ jobs: - name: Run AppImage packaging script run: ./.github/linux-appimage-qt.sh - + - name: Upload executable uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 3edbe710..a3d36780 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -26,7 +26,7 @@ jobs: - name: Install misc packages run: > sudo apt-get update && sudo apt install libx11-dev libxext-dev libwayland-dev libfuse2 clang build-essential - + - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ @@ -40,10 +40,10 @@ jobs: path: | ${{github.workspace}}/build/shadps4 ${{github.workspace}}/build/libSDL3.so.0.0.0 - + - name: Run AppImage packaging script run: ./.github/linux-appimage-sdl.sh - + - name: Upload executable uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/windows-qt.yml b/.github/workflows/windows-qt.yml index 0bf2da9f..78ab2171 100644 --- a/.github/workflows/windows-qt.yml +++ b/.github/workflows/windows-qt.yml @@ -30,7 +30,7 @@ jobs: with: arch: win64_msvc2019_64 version: 6.7.0 - + - 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. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type @@ -43,12 +43,12 @@ jobs: - name: Deploy run: | mkdir upload - move build/Release/shadps4.exe upload + move build/Release/shadPS4.exe upload move build/Release/zlib-ng2.dll upload - windeployqt --dir upload upload/shadps4.exe + windeployqt --dir upload upload/shadPS4.exe - name: Upload executable uses: actions/upload-artifact@v4 with: name: shadps4-win64-qt - path: upload \ No newline at end of file + path: upload diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6aaa3750..c23e41a6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -36,5 +36,5 @@ jobs: name: shadps4-win64 # A file, directory or wildcard pattern that describes what to upload path: | - ${{github.workspace}}/build/Release/shadps4.exe + ${{github.workspace}}/build/Release/shadPS4.exe ${{github.workspace}}/build/Release/SDL3.dll \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 52fa9c05..2451ff6b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,19 +1,3 @@ -[submodule "third-party/magic_enum"] - path = third-party/magic_enum - url = https://github.com/Neargye/magic_enum.git - shallow = true -[submodule "third-party/zydis"] - path = third-party/zydis - url = https://github.com/zyantific/zydis.git - shallow = true -[submodule "third-party/toml11"] - path = third-party/toml11 - url = https://github.com/ToruNiina/toml11 - branch = master -[submodule "third-party/xxHash"] - path = third-party/xxHash - url = https://github.com/Cyan4973/xxHash.git - branch = dev [submodule "externals/discord-rpc"] path = externals/discord-rpc url = https://github.com/shadps4-emu/ext-discord-rpc.git @@ -60,3 +44,15 @@ [submodule "externals/winpthreads"] path = externals/winpthreads url = https://github.com/shadps4-emu/winpthreads.git +[submodule "externals/magic_enum"] + path = externals/magic_enum + url = https://github.com/Neargye/magic_enum.git +[submodule "externals/toml11"] + path = externals/toml11 + url = https://github.com/ToruNiina/toml11.git +[submodule "externals/xxHash"] + path = externals/xxHash + url = https://github.com/Cyan4973/xxHash.git +[submodule "externals/zydis"] + path = externals/zydis + url = https://github.com/zyantific/zydis.git diff --git a/CMakeLists.txt b/CMakeLists.txt index cad16506..549bcf40 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,6 @@ if (CLANG_FORMAT) endif() add_subdirectory(externals) -add_subdirectory(third-party) include_directories(src) if(ENABLE_QT_GUI) @@ -444,8 +443,7 @@ endif() add_custom_command(TARGET shadps4 POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different $ - $ -) + $) add_custom_command(TARGET shadps4 POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index bf8eaf89..649df9ca 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -67,6 +67,21 @@ add_subdirectory(robin-map EXCLUDE_FROM_ALL) # Xbyak add_subdirectory(xbyak EXCLUDE_FROM_ALL) +# MagicEnum +add_subdirectory(magic_enum EXCLUDE_FROM_ALL) + +# Toml11 +add_subdirectory(toml11 EXCLUDE_FROM_ALL) + +# xxHash +add_library(xxhash INTERFACE) +target_include_directories(xxhash INTERFACE xxhash) + +# Zydis +option(ZYDIS_BUILD_TOOLS "" OFF) +option(ZYDIS_BUILD_EXAMPLES "" OFF) +add_subdirectory(zydis EXCLUDE_FROM_ALL) + # Winpthreads if (WIN32) add_subdirectory(winpthreads EXCLUDE_FROM_ALL) diff --git a/externals/magic_enum b/externals/magic_enum new file mode 160000 index 00000000..a2077c01 --- /dev/null +++ b/externals/magic_enum @@ -0,0 +1 @@ +Subproject commit a2077c01c3071c12279b7ab40a19607647682d37 diff --git a/externals/toml11 b/externals/toml11 new file mode 160000 index 00000000..85faca9c --- /dev/null +++ b/externals/toml11 @@ -0,0 +1 @@ +Subproject commit 85faca9cbe8d76324ff38c1801be44c63e12d5be diff --git a/externals/vulkan-headers b/externals/vulkan-headers index 4bc77c26..5677bafb 160000 --- a/externals/vulkan-headers +++ b/externals/vulkan-headers @@ -1 +1 @@ -Subproject commit 4bc77c26ff9ce89cf4a4f79e1c24a44604132d53 +Subproject commit 5677bafb820e476441e9e1f745371b72133407d3 diff --git a/externals/xxHash b/externals/xxHash new file mode 160000 index 00000000..e9455b2c --- /dev/null +++ b/externals/xxHash @@ -0,0 +1 @@ +Subproject commit e9455b2c204df00f31200392f96ac12197de8bf0 diff --git a/externals/zydis b/externals/zydis new file mode 160000 index 00000000..fd3e9a6c --- /dev/null +++ b/externals/zydis @@ -0,0 +1 @@ +Subproject commit fd3e9a6cc8bdcc617b531feda186699e51664f76 diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt deleted file mode 100644 index b6636f25..00000000 --- a/third-party/CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ -# SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project -# SPDX-License-Identifier: GPL-2.0-or-later - -if (MSVC) - # Silence "deprecation" warnings - add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS) -endif() - -# MagicEnum -add_subdirectory(magic_enum EXCLUDE_FROM_ALL) - -# Toml11 -add_subdirectory(toml11 EXCLUDE_FROM_ALL) - -# xxHash -add_library(xxhash INTERFACE) -target_include_directories(xxhash INTERFACE xxhash) - -# Zydis -option(ZYDIS_BUILD_TOOLS "" OFF) -option(ZYDIS_BUILD_EXAMPLES "" OFF) -add_subdirectory(zydis EXCLUDE_FROM_ALL) - - - diff --git a/third-party/magic_enum b/third-party/magic_enum deleted file mode 160000 index 4904822d..00000000 --- a/third-party/magic_enum +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4904822db8770d04444add00a9e155568d3e8bd1 diff --git a/third-party/toml11 b/third-party/toml11 deleted file mode 160000 index 087408a8..00000000 --- a/third-party/toml11 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 087408a8fbc8983d8c590eee9d3541400dfa34d9 diff --git a/third-party/xxHash b/third-party/xxHash deleted file mode 160000 index 058e54b1..00000000 --- a/third-party/xxHash +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 058e54b10b10c658fd50862e6f65f55522afa182 diff --git a/third-party/zydis b/third-party/zydis deleted file mode 160000 index a6d0c713..00000000 --- a/third-party/zydis +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a6d0c713b71b5009634868389f0ff551871273d6