mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-02-25 03:40:37 +00:00
Moves glm, GSL and libpng to 3rdparty
Moves glm and GSL to 3rdparty Moves libpng to 3rdparty
This commit is contained in:
parent
6182f5346d
commit
38f93461d1
4
.gitmodules
vendored
4
.gitmodules
vendored
@ -20,10 +20,10 @@
|
|||||||
path = rsx_program_decompiler
|
path = rsx_program_decompiler
|
||||||
url = https://github.com/RPCS3/rsx_program_decompiler
|
url = https://github.com/RPCS3/rsx_program_decompiler
|
||||||
[submodule "GSL"]
|
[submodule "GSL"]
|
||||||
path = GSL
|
path = 3rdparty/GSL
|
||||||
url = https://github.com/Microsoft/GSL.git
|
url = https://github.com/Microsoft/GSL.git
|
||||||
[submodule "libpng"]
|
[submodule "libpng"]
|
||||||
path = libpng
|
path = 3rdparty/libpng
|
||||||
url = https://github.com/RPCS3/libpng
|
url = https://github.com/RPCS3/libpng
|
||||||
[submodule "Vulkan/glslang"]
|
[submodule "Vulkan/glslang"]
|
||||||
path = Vulkan/glslang
|
path = Vulkan/glslang
|
||||||
|
@ -53,7 +53,7 @@ before_install:
|
|||||||
fi;
|
fi;
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- git submodule update --init asmjit 3rdparty/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
|
- mkdir build
|
||||||
- cd 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
|
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ..; else cmake .. -DLLVM_DIR=/usr/local/opt/llvm36/lib/llvm-3.6/share/llvm/cmake; fi
|
||||||
|
0
GSL → 3rdparty/GSL
vendored
0
GSL → 3rdparty/GSL
vendored
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user