Migrating from third-party to externals (#138)
* third-party migration to externals * Fix * Lower case for Linux
This commit is contained in:
Xphalnos
GitHub
parent
b0978f4168
commit
8cf64a33b2
|
|
@ -43,9 +43,9 @@ 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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
$<TARGET_FILE:zlib>
|
||||
$<TARGET_FILE_DIR:shadps4>
|
||||
)
|
||||
$<TARGET_FILE_DIR:shadps4>)
|
||||
|
||||
add_custom_command(TARGET shadps4 POST_BUILD
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit a2077c01c3071c12279b7ab40a19607647682d37
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 85faca9cbe8d76324ff38c1801be44c63e12d5be
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 4bc77c26ff9ce89cf4a4f79e1c24a44604132d53
|
||||
Subproject commit 5677bafb820e476441e9e1f745371b72133407d3
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit e9455b2c204df00f31200392f96ac12197de8bf0
|
||||
|
|
@ -0,0 +1 @@
|
|||
Subproject commit fd3e9a6cc8bdcc617b531feda186699e51664f76
|
||||
|
|
@ -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)
|
||||
|
||||
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 4904822db8770d04444add00a9e155568d3e8bd1
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 087408a8fbc8983d8c590eee9d3541400dfa34d9
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit 058e54b10b10c658fd50862e6f65f55522afa182
|
||||
|
|
@ -1 +0,0 @@
|
|||
Subproject commit a6d0c713b71b5009634868389f0ff551871273d6
|
||||
Loading…
Reference in New Issue