mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-07-23 18:45:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed an issue with clang format in windows

Browse Source
This commit is contained in:
georgemoralis 2024-02-25 17:37:53 +02:00
parent 08aba86ca1
commit 1f4578294b
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitmodules vendored
View File

@ -1,6 +1,3 @@
# SPDX-FileCopyrightText: 2024 shadPS4 Emulator Project
# SPDX-License-Identifier: GPL-2.0-or-later
[submodule "third-party/imgui"] [submodule "third-party/imgui"]
path = third-party/imgui path = third-party/imgui
url = https://github.com/ocornut/imgui url = https://github.com/ocornut/imgui
@ -29,9 +26,6 @@
path = third-party/winpthread path = third-party/winpthread
url = https://github.com/shadps4/winpthread.git url = https://github.com/shadps4/winpthread.git
branch = main branch = main
[submodule "third-party/discord-rpc"]
path = third-party/discord-rpc
url = https://github.com/discord/discord-rpc
[submodule "third-party/toml11"] [submodule "third-party/toml11"]
path = third-party/toml11 path = third-party/toml11
url = https://github.com/ToruNiina/toml11 url = https://github.com/ToruNiina/toml11
@ -47,3 +41,7 @@
[submodule "third-party/vulkan"] [submodule "third-party/vulkan"]
path = third-party/vulkan path = third-party/vulkan
url = https://github.com/GPUCode/vulkan url = https://github.com/GPUCode/vulkan
[submodule "externals/discord-rpc"]
path = externals/discord-rpc
url = https://github.com/shadps4-emu/ext-discord-rpc.git
branch = master

1
CMakeLists.txt
View File

@ -82,6 +82,7 @@ if (CLANG_FORMAT)
endif() endif()
add_subdirectory(third-party) add_subdirectory(third-party)
add_subdirectory(externals)
include_directories(src) include_directories(src)
set(LIBRARIES src/core/libraries/library_common.h set(LIBRARIES src/core/libraries/library_common.h

12
externals/CMakeLists.txt vendored Normal file
View File

@ -0,0 +1,12 @@
# 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()
# Discord-RPC
set(BUILD_EXAMPLES OFF CACHE BOOL "")
add_subdirectory(discord-rpc EXCLUDE_FROM_ALL)
target_include_directories(discord-rpc INTERFACE ./discord-rpc/include)

1
externals/discord-rpc vendored Submodule

@ -0,0 +1 @@
Subproject commit 7eed3d879110fab789ce41519021801df15d76ad

7
third-party/CMakeLists.txt vendored
View File

@ -6,11 +6,6 @@ if (MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS) add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)
endif() endif()
# Discord-RPC
set(BUILD_EXAMPLES OFF CACHE BOOL "")
add_subdirectory(discord-rpc EXCLUDE_FROM_ALL)
target_include_directories(discord-rpc INTERFACE ./discord-rpc/include)
# fmtlib # fmtlib
add_subdirectory(fmt EXCLUDE_FROM_ALL) add_subdirectory(fmt EXCLUDE_FROM_ALL)
@ -68,6 +63,6 @@ target_include_directories(imgui PUBLIC
imgui/include imgui/include
) )
target_link_libraries(imgui PRIVATE SDL3-shared ${CMAKE_DL_LIBS} Zydis discord-rpc) target_link_libraries(imgui PRIVATE SDL3-shared ${CMAKE_DL_LIBS} Zydis)

1
third-party/discord-rpc vendored

@ -1 +0,0 @@
Subproject commit 963aa9f3e5ce81a4682c6ca3d136cddda614db33