Merge pull request #1595 from MyaniPT/patch-1

Move 3rdparty dependencies to 3rdparty (part 1)
This commit is contained in:
vlj 2016-03-21 00:02:40 +01:00
commit 6fab5a885f
336 changed files with 40 additions and 37 deletions

8
.gitmodules vendored
View file

@ -3,7 +3,7 @@
url = https://github.com/wxWidgets/wxWidgets
ignore = dirty
[submodule "rpcs3-ffmpeg"]
path = ffmpeg
path = 3rdparty/ffmpeg
url = https://github.com/hrydgard/ppsspp-ffmpeg
[submodule "asmjit"]
path = asmjit
@ -14,16 +14,16 @@
url = https://github.com/llvm-mirror/llvm
branch = release_36
[submodule "minidx9"]
path = minidx9
path = 3rdparty/minidx9
url = https://github.com/hrydgard/minidx9.git
[submodule "rsx_program_decompiler"]
path = rsx_program_decompiler
url = https://github.com/RPCS3/rsx_program_decompiler
[submodule "GSL"]
path = GSL
path = 3rdparty/GSL
url = https://github.com/Microsoft/GSL.git
[submodule "libpng"]
path = libpng
path = 3rdparty/libpng
url = https://github.com/RPCS3/libpng
[submodule "Vulkan/glslang"]
path = Vulkan/glslang

View file

@ -53,7 +53,7 @@ before_install:
fi;
before_script:
- git submodule update --init asmjit ffmpeg rsx_program_decompiler GSL libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
- git submodule update --init asmjit 3rdparty/ffmpeg rsx_program_decompiler 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
- mkdir build
- cd build
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ..; else cmake .. -DLLVM_DIR=/usr/local/opt/llvm36/lib/llvm-3.6/share/llvm/cmake; fi

View file

View file

View file

Some files were not shown because too many files have changed in this diff Show more