diff --git a/.gitmodules b/.gitmodules index 1c2d62d043..6508eebf8c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -56,3 +56,6 @@ path = 3rdparty/FAudio url = https://github.com/FNA-XNA/FAudio.git ignore = dirty +[submodule "3rdparty/span"] + path = 3rdparty/span + url = https://github.com/tcbrindle/span diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 6dfd7d21a1..1203764c79 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -209,6 +209,11 @@ 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) + + # stblib add_library(3rdparty_stblib INTERFACE) target_include_directories(3rdparty_stblib INTERFACE stblib) @@ -425,6 +430,7 @@ 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) add_library(3rdparty::alsa ALIAS ${ALSA_TARGET}) diff --git a/3rdparty/span b/3rdparty/span new file mode 160000 index 0000000000..9d7559aabd --- /dev/null +++ b/3rdparty/span @@ -0,0 +1 @@ +Subproject commit 9d7559aabdebf569cab3480a7ea2a87948c0ae47 diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt index b9910349e9..c0b8857ddd 100644 --- a/rpcs3/Emu/CMakeLists.txt +++ b/rpcs3/Emu/CMakeLists.txt @@ -49,7 +49,8 @@ target_include_directories(rpcs3_emu PUBLIC "${CMAKE_SOURCE_DIR}") target_link_libraries(rpcs3_emu PUBLIC 3rdparty::pugixml - 3rdparty::gsl) + 3rdparty::gsl + 3rdparty::span) if (MSVC) set_source_files_properties("../../Utilities/JIT.cpp" PROPERTIES COMPILE_FLAGS /GR-) @@ -412,7 +413,7 @@ target_link_libraries(rpcs3_emu 3rdparty::vulkan 3rdparty::glew 3rdparty::libusb PRIVATE - 3rdparty::gsl 3rdparty::xxhash + 3rdparty::gsl 3rdparty::span 3rdparty::xxhash )