mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-04-20 11:36:13 +00:00
Merge pull request #1595 from MyaniPT/patch-1
Move 3rdparty dependencies to 3rdparty (part 1)
This commit is contained in:
commit
6fab5a885f
336 changed files with 40 additions and 37 deletions
8
.gitmodules
vendored
8
.gitmodules
vendored
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
0
GL/glext.h → 3rdparty/GL/glext.h
vendored
0
GL/glext.h → 3rdparty/GL/glext.h
vendored
0
GSL → 3rdparty/GSL
vendored
0
GSL → 3rdparty/GSL
vendored
0
ffmpeg → 3rdparty/ffmpeg
vendored
0
ffmpeg → 3rdparty/ffmpeg
vendored
0
glm/copying.txt → 3rdparty/glm/copying.txt
vendored
0
glm/copying.txt → 3rdparty/glm/copying.txt
vendored
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue