mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-16 23:17:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

3rdparty: remove optional submodule

Browse Source
This commit is contained in:
scribam 2018-08-27 17:30:30 +02:00 committed by Ivan
parent 79cf2832ae
commit 6c62d042c5
5 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -26,9 +26,6 @@
url = https://github.com/RPCS3/hidapi url = https://github.com/RPCS3/hidapi
branch = master branch = master
ignore = dirty ignore = dirty
[submodule "3rdparty/Optional"]
path = 3rdparty/Optional
url = https://github.com/akrzemi1/Optional.git
[submodule "3rdparty/pugixml"] [submodule "3rdparty/pugixml"]
path = 3rdparty/pugixml path = 3rdparty/pugixml
url = https://github.com/zeux/pugixml url = https://github.com/zeux/pugixml

2
.travis.yml
View File

@ -55,7 +55,7 @@ install:
fi; fi;
before_script: 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 - mkdir build ; cd build
- if [ "$TRAVIS_PULL_REQUEST" = false ]; then - if [ "$TRAVIS_PULL_REQUEST" = false ]; then
export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH"; export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH";

1
3rdparty/Optional vendored

@ -1 +0,0 @@
Subproject commit f27e79084a9176672ed1eae50b3397fa8035d50d

1
appveyor.yml
View File

@ -49,7 +49,6 @@ install:
3rdparty/GSL ` 3rdparty/GSL `
3rdparty/hidapi ` 3rdparty/hidapi `
3rdparty/libpng ` 3rdparty/libpng `
3rdparty/Optional `
3rdparty/pugixml ` 3rdparty/pugixml `
3rdparty/xxHash ` 3rdparty/xxHash `
3rdparty/yaml-cpp ` 3rdparty/yaml-cpp `

1
rpcs3/CMakeLists.txt
View File

@ -328,7 +328,6 @@ ${LLVM_INCLUDE_DIRS}
"${RPCS3_SRC_DIR}/../3rdparty/GL" "${RPCS3_SRC_DIR}/../3rdparty/GL"
"${RPCS3_SRC_DIR}/../3rdparty/stblib" "${RPCS3_SRC_DIR}/../3rdparty/stblib"
"${RPCS3_SRC_DIR}/../3rdparty/cereal/include" "${RPCS3_SRC_DIR}/../3rdparty/cereal/include"
"${RPCS3_SRC_DIR}/../3rdparty/Optional"
"${RPCS3_SRC_DIR}/../3rdparty/discord-rpc/include" "${RPCS3_SRC_DIR}/../3rdparty/discord-rpc/include"
"${RPCS3_SRC_DIR}/../3rdparty/xxHash" "${RPCS3_SRC_DIR}/../3rdparty/xxHash"
"${RPCS3_SRC_DIR}/../3rdparty/GPUOpen/include" "${RPCS3_SRC_DIR}/../3rdparty/GPUOpen/include"