From 7e4d1426824c79db465ee8286406479fd3486c5a Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sat, 9 Nov 2019 16:13:20 +0100 Subject: [PATCH] =?UTF-8?q?Remove=20GSL=20as=20we=20don=E2=80=99t=20use=20?= =?UTF-8?q?it=20anymore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 4 ---- 3rdparty/CMakeLists.txt | 6 ------ 3rdparty/GSL | 1 - rpcs3/Emu/CMakeLists.txt | 3 +-- 4 files changed, 1 insertion(+), 13 deletions(-) delete mode 160000 3rdparty/GSL diff --git a/.gitmodules b/.gitmodules index 6508eebf8c..24f3fa4687 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,10 +11,6 @@ url = https://github.com/RPCS3/llvm branch = release_60 ignore = dirty -[submodule "GSL"] - path = 3rdparty/GSL - url = https://github.com/Microsoft/GSL.git - ignore = dirty [submodule "Vulkan/glslang"] path = Vulkan/glslang url = https://github.com/KhronosGroup/glslang.git diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 1203764c79..80698ac959 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -204,11 +204,6 @@ else() endif() -# GSL -add_library(3rdparty_gsl INTERFACE) -target_include_directories(3rdparty_gsl INTERFACE GSL/include) - - # span add_library(3rdparty_span INTERFACE) 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::cereal ALIAS 3rdparty_cereal) add_library(3rdparty::opengl ALIAS 3rdparty_opengl) -add_library(3rdparty::gsl ALIAS 3rdparty_gsl) add_library(3rdparty::span ALIAS 3rdparty_span) add_library(3rdparty::stblib ALIAS 3rdparty_stblib) add_library(3rdparty::discord-rpc ALIAS 3rdparty_discord-rpc) diff --git a/3rdparty/GSL b/3rdparty/GSL deleted file mode 160000 index 1995e86d1a..0000000000 --- a/3rdparty/GSL +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1995e86d1ad70519465374fb4876c6ef7c9f8c61 diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt index c0b8857ddd..db4aa1af75 100644 --- a/rpcs3/Emu/CMakeLists.txt +++ b/rpcs3/Emu/CMakeLists.txt @@ -49,7 +49,6 @@ target_include_directories(rpcs3_emu PUBLIC "${CMAKE_SOURCE_DIR}") target_link_libraries(rpcs3_emu PUBLIC 3rdparty::pugixml - 3rdparty::gsl 3rdparty::span) if (MSVC) @@ -413,7 +412,7 @@ target_link_libraries(rpcs3_emu 3rdparty::vulkan 3rdparty::glew 3rdparty::libusb PRIVATE - 3rdparty::gsl 3rdparty::span 3rdparty::xxhash + 3rdparty::span 3rdparty::xxhash )