RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-24 11:43:05 +01:00
Code Issues Releases Wiki Activity

Remove GSL as we don’t use it anymore

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2019-11-09 16:13:20 +01:00
parent f76720ceb0
commit 7e4d142682
4 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -11,10 +11,6 @@
url = https://github.com/RPCS3/llvm url = https://github.com/RPCS3/llvm
branch = release_60 branch = release_60
ignore = dirty ignore = dirty
[submodule "GSL"]
path = 3rdparty/GSL
url = https://github.com/Microsoft/GSL.git
ignore = dirty
[submodule "Vulkan/glslang"] [submodule "Vulkan/glslang"]
path = Vulkan/glslang path = Vulkan/glslang
url = https://github.com/KhronosGroup/glslang.git url = https://github.com/KhronosGroup/glslang.git

6
3rdparty/CMakeLists.txt vendored
View File

@ -204,11 +204,6 @@ else()
endif() endif()
# GSL
add_library(3rdparty_gsl INTERFACE)
target_include_directories(3rdparty_gsl INTERFACE GSL/include)
# span # span
add_library(3rdparty_span INTERFACE) add_library(3rdparty_span INTERFACE)
target_include_directories(3rdparty_span INTERFACE span/include) target_include_directories(3rdparty_span INTERFACE span/include)
@ -429,7 +424,6 @@ add_library(3rdparty::hidapi ALIAS 3rdparty_hidapi)
add_library(3rdparty::libpng ALIAS ${LIBPNG_TARGET}) add_library(3rdparty::libpng ALIAS ${LIBPNG_TARGET})
add_library(3rdparty::cereal ALIAS 3rdparty_cereal) add_library(3rdparty::cereal ALIAS 3rdparty_cereal)
add_library(3rdparty::opengl ALIAS 3rdparty_opengl) add_library(3rdparty::opengl ALIAS 3rdparty_opengl)
add_library(3rdparty::gsl ALIAS 3rdparty_gsl)
add_library(3rdparty::span ALIAS 3rdparty_span) add_library(3rdparty::span ALIAS 3rdparty_span)
add_library(3rdparty::stblib ALIAS 3rdparty_stblib) add_library(3rdparty::stblib ALIAS 3rdparty_stblib)
add_library(3rdparty::discord-rpc ALIAS 3rdparty_discord-rpc) add_library(3rdparty::discord-rpc ALIAS 3rdparty_discord-rpc)

1
3rdparty/GSL vendored

@ -1 +0,0 @@
Subproject commit 1995e86d1ad70519465374fb4876c6ef7c9f8c61

3
rpcs3/Emu/CMakeLists.txt
View File

@ -49,7 +49,6 @@ target_include_directories(rpcs3_emu PUBLIC "${CMAKE_SOURCE_DIR}")
target_link_libraries(rpcs3_emu target_link_libraries(rpcs3_emu
PUBLIC PUBLIC
3rdparty::pugixml 3rdparty::pugixml
3rdparty::gsl
3rdparty::span) 3rdparty::span)
if (MSVC) if (MSVC)
@ -413,7 +412,7 @@ target_link_libraries(rpcs3_emu
3rdparty::vulkan 3rdparty::glew 3rdparty::vulkan 3rdparty::glew
3rdparty::libusb 3rdparty::libusb
PRIVATE PRIVATE
3rdparty::gsl 3rdparty::span 3rdparty::xxhash 3rdparty::span 3rdparty::xxhash
) )