From 6c62d042c520fabd752d8669aab954fe8a61b7a8 Mon Sep 17 00:00:00 2001 From: scribam Date: Mon, 27 Aug 2018 17:30:30 +0200 Subject: [PATCH] 3rdparty: remove optional submodule --- .gitmodules | 3 --- .travis.yml | 2 +- 3rdparty/Optional | 1 - appveyor.yml | 1 - rpcs3/CMakeLists.txt | 1 - 5 files changed, 1 insertion(+), 7 deletions(-) delete mode 160000 3rdparty/Optional diff --git a/.gitmodules b/.gitmodules index 389faf7b13..a386cd8e6d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,9 +26,6 @@ url = https://github.com/RPCS3/hidapi branch = master ignore = dirty -[submodule "3rdparty/Optional"] - path = 3rdparty/Optional - url = https://github.com/akrzemi1/Optional.git [submodule "3rdparty/pugixml"] path = 3rdparty/pugixml url = https://github.com/zeux/pugixml diff --git a/.travis.yml b/.travis.yml index 07d27e6419..ebb7b1e9a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ install: fi; before_script: - - git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng 3rdparty/cereal 3rdparty/hidapi 3rdparty/Optional 3rdparty/xxHash 3rdparty/yaml-cpp Vulkan/glslang + - git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng 3rdparty/cereal 3rdparty/hidapi 3rdparty/xxHash 3rdparty/yaml-cpp Vulkan/glslang - mkdir build ; cd build - if [ "$TRAVIS_PULL_REQUEST" = false ]; then export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH"; diff --git a/3rdparty/Optional b/3rdparty/Optional deleted file mode 160000 index f27e79084a..0000000000 --- a/3rdparty/Optional +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f27e79084a9176672ed1eae50b3397fa8035d50d diff --git a/appveyor.yml b/appveyor.yml index 33d65dc5ef..dc46a1619f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -49,7 +49,6 @@ install: 3rdparty/GSL ` 3rdparty/hidapi ` 3rdparty/libpng ` - 3rdparty/Optional ` 3rdparty/pugixml ` 3rdparty/xxHash ` 3rdparty/yaml-cpp ` diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 5b154a3702..95704e79ee 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -328,7 +328,6 @@ ${LLVM_INCLUDE_DIRS} "${RPCS3_SRC_DIR}/../3rdparty/GL" "${RPCS3_SRC_DIR}/../3rdparty/stblib" "${RPCS3_SRC_DIR}/../3rdparty/cereal/include" -"${RPCS3_SRC_DIR}/../3rdparty/Optional" "${RPCS3_SRC_DIR}/../3rdparty/discord-rpc/include" "${RPCS3_SRC_DIR}/../3rdparty/xxHash" "${RPCS3_SRC_DIR}/../3rdparty/GPUOpen/include"