Moves glm, GSL and libpng to 3rdparty

Moves glm and GSL to 3rdparty Moves libpng to 3rdparty
2025-02-24 18:39:56 +00:00 · 2016-03-20 01:05:03 +00:00 · 2016-03-20 01:05:03 +00:00 · 38f93461d1
commit 38f93461d1
parent 6182f5346d
275 changed files with 12 additions and 20 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -20,10 +20,10 @@
 	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
--- a/.travis.yml
+++ b/.travis.yml
@ -53,7 +53,7 @@ before_install:
    fi;

 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
 - 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
--- a/3rdparty/GSL
+++ b/3rdparty/GSL
--- a/3rdparty/glm/CMakeLists.txt
+++ b/3rdparty/glm/CMakeLists.txt
--- a/3rdparty/glm/CTestConfig.cmake
+++ b/3rdparty/glm/CTestConfig.cmake
--- a/3rdparty/glm/cmake/GNUInstallDirs.cmake
+++ b/3rdparty/glm/cmake/GNUInstallDirs.cmake
--- a/3rdparty/glm/copying.txt
+++ b/3rdparty/glm/copying.txt
--- a/3rdparty/glm/glm/CMakeLists.txt
+++ b/3rdparty/glm/glm/CMakeLists.txt
--- a/3rdparty/glm/glm/common.hpp
+++ b/3rdparty/glm/glm/common.hpp
--- a/3rdparty/glm/glm/detail/_features.hpp
+++ b/3rdparty/glm/glm/detail/_features.hpp
--- a/3rdparty/glm/glm/detail/_fixes.hpp
+++ b/3rdparty/glm/glm/detail/_fixes.hpp
--- a/3rdparty/glm/glm/detail/_noise.hpp
+++ b/3rdparty/glm/glm/detail/_noise.hpp
--- a/3rdparty/glm/glm/detail/_swizzle.hpp
+++ b/3rdparty/glm/glm/detail/_swizzle.hpp
--- a/3rdparty/glm/glm/detail/_swizzle_func.hpp
+++ b/3rdparty/glm/glm/detail/_swizzle_func.hpp
--- a/3rdparty/glm/glm/detail/_vectorize.hpp
+++ b/3rdparty/glm/glm/detail/_vectorize.hpp
--- a/3rdparty/glm/glm/detail/dummy.cpp
+++ b/3rdparty/glm/glm/detail/dummy.cpp
--- a/3rdparty/glm/glm/detail/func_common.hpp
+++ b/3rdparty/glm/glm/detail/func_common.hpp
--- a/3rdparty/glm/glm/detail/func_common.inl
+++ b/3rdparty/glm/glm/detail/func_common.inl
--- a/3rdparty/glm/glm/detail/func_exponential.hpp
+++ b/3rdparty/glm/glm/detail/func_exponential.hpp
--- a/3rdparty/glm/glm/detail/func_exponential.inl
+++ b/3rdparty/glm/glm/detail/func_exponential.inl
--- a/3rdparty/glm/glm/detail/func_geometric.hpp
+++ b/3rdparty/glm/glm/detail/func_geometric.hpp
--- a/3rdparty/glm/glm/detail/func_geometric.inl
+++ b/3rdparty/glm/glm/detail/func_geometric.inl
--- a/3rdparty/glm/glm/detail/func_integer.hpp
+++ b/3rdparty/glm/glm/detail/func_integer.hpp
--- a/3rdparty/glm/glm/detail/func_integer.inl
+++ b/3rdparty/glm/glm/detail/func_integer.inl
--- a/3rdparty/glm/glm/detail/func_matrix.hpp
+++ b/3rdparty/glm/glm/detail/func_matrix.hpp
--- a/3rdparty/glm/glm/detail/func_matrix.inl
+++ b/3rdparty/glm/glm/detail/func_matrix.inl
--- a/3rdparty/glm/glm/detail/func_noise.hpp
+++ b/3rdparty/glm/glm/detail/func_noise.hpp
--- a/3rdparty/glm/glm/detail/func_noise.inl
+++ b/3rdparty/glm/glm/detail/func_noise.inl
--- a/3rdparty/glm/glm/detail/func_packing.hpp
+++ b/3rdparty/glm/glm/detail/func_packing.hpp
--- a/3rdparty/glm/glm/detail/func_packing.inl
+++ b/3rdparty/glm/glm/detail/func_packing.inl
--- a/3rdparty/glm/glm/detail/func_trigonometric.hpp
+++ b/3rdparty/glm/glm/detail/func_trigonometric.hpp
--- a/3rdparty/glm/glm/detail/func_trigonometric.inl
+++ b/3rdparty/glm/glm/detail/func_trigonometric.inl
--- a/3rdparty/glm/glm/detail/func_vector_relational.hpp
+++ b/3rdparty/glm/glm/detail/func_vector_relational.hpp
--- a/3rdparty/glm/glm/detail/func_vector_relational.inl
+++ b/3rdparty/glm/glm/detail/func_vector_relational.inl
--- a/3rdparty/glm/glm/detail/glm.cpp
+++ b/3rdparty/glm/glm/detail/glm.cpp
--- a/3rdparty/glm/glm/detail/intrinsic_common.hpp
+++ b/3rdparty/glm/glm/detail/intrinsic_common.hpp
--- a/3rdparty/glm/glm/detail/intrinsic_common.inl
+++ b/3rdparty/glm/glm/detail/intrinsic_common.inl
--- a/3rdparty/glm/glm/detail/intrinsic_exponential.hpp
+++ b/3rdparty/glm/glm/detail/intrinsic_exponential.hpp
--- a/3rdparty/glm/glm/detail/intrinsic_exponential.inl
+++ b/3rdparty/glm/glm/detail/intrinsic_exponential.inl
--- a/3rdparty/glm/glm/detail/intrinsic_geometric.hpp
+++ b/3rdparty/glm/glm/detail/intrinsic_geometric.hpp
--- a/3rdparty/glm/glm/detail/intrinsic_geometric.inl
+++ b/3rdparty/glm/glm/detail/intrinsic_geometric.inl
--- a/3rdparty/glm/glm/detail/intrinsic_integer.hpp
+++ b/3rdparty/glm/glm/detail/intrinsic_integer.hpp
--- a/3rdparty/glm/glm/detail/intrinsic_integer.inl
+++ b/3rdparty/glm/glm/detail/intrinsic_integer.inl
--- a/3rdparty/glm/glm/detail/intrinsic_matrix.hpp
+++ b/3rdparty/glm/glm/detail/intrinsic_matrix.hpp
--- a/3rdparty/glm/glm/detail/intrinsic_matrix.inl
+++ b/3rdparty/glm/glm/detail/intrinsic_matrix.inl
--- a/3rdparty/glm/glm/detail/intrinsic_trigonometric.hpp
+++ b/3rdparty/glm/glm/detail/intrinsic_trigonometric.hpp
--- a/3rdparty/glm/glm/detail/intrinsic_trigonometric.inl
+++ b/3rdparty/glm/glm/detail/intrinsic_trigonometric.inl
--- a/3rdparty/glm/glm/detail/intrinsic_vector_relational.hpp
+++ b/3rdparty/glm/glm/detail/intrinsic_vector_relational.hpp
--- a/3rdparty/glm/glm/detail/intrinsic_vector_relational.inl
+++ b/3rdparty/glm/glm/detail/intrinsic_vector_relational.inl
--- a/3rdparty/glm/glm/detail/precision.hpp
+++ b/3rdparty/glm/glm/detail/precision.hpp
--- a/3rdparty/glm/glm/detail/setup.hpp
+++ b/3rdparty/glm/glm/detail/setup.hpp
--- a/3rdparty/glm/glm/detail/type_float.hpp
+++ b/3rdparty/glm/glm/detail/type_float.hpp
--- a/3rdparty/glm/glm/detail/type_gentype.hpp
+++ b/3rdparty/glm/glm/detail/type_gentype.hpp
--- a/3rdparty/glm/glm/detail/type_gentype.inl
+++ b/3rdparty/glm/glm/detail/type_gentype.inl
--- a/3rdparty/glm/glm/detail/type_half.hpp
+++ b/3rdparty/glm/glm/detail/type_half.hpp
--- a/3rdparty/glm/glm/detail/type_half.inl
+++ b/3rdparty/glm/glm/detail/type_half.inl
--- a/3rdparty/glm/glm/detail/type_int.hpp
+++ b/3rdparty/glm/glm/detail/type_int.hpp
--- a/3rdparty/glm/glm/detail/type_mat.hpp
+++ b/3rdparty/glm/glm/detail/type_mat.hpp
--- a/3rdparty/glm/glm/detail/type_mat.inl
+++ b/3rdparty/glm/glm/detail/type_mat.inl
--- a/3rdparty/glm/glm/detail/type_mat2x2.hpp
+++ b/3rdparty/glm/glm/detail/type_mat2x2.hpp
--- a/3rdparty/glm/glm/detail/type_mat2x2.inl
+++ b/3rdparty/glm/glm/detail/type_mat2x2.inl
--- a/3rdparty/glm/glm/detail/type_mat2x3.hpp
+++ b/3rdparty/glm/glm/detail/type_mat2x3.hpp
--- a/3rdparty/glm/glm/detail/type_mat2x3.inl
+++ b/3rdparty/glm/glm/detail/type_mat2x3.inl
--- a/3rdparty/glm/glm/detail/type_mat2x4.hpp
+++ b/3rdparty/glm/glm/detail/type_mat2x4.hpp
--- a/3rdparty/glm/glm/detail/type_mat2x4.inl
+++ b/3rdparty/glm/glm/detail/type_mat2x4.inl
--- a/3rdparty/glm/glm/detail/type_mat3x2.hpp
+++ b/3rdparty/glm/glm/detail/type_mat3x2.hpp
--- a/3rdparty/glm/glm/detail/type_mat3x2.inl
+++ b/3rdparty/glm/glm/detail/type_mat3x2.inl
--- a/3rdparty/glm/glm/detail/type_mat3x3.hpp
+++ b/3rdparty/glm/glm/detail/type_mat3x3.hpp
--- a/3rdparty/glm/glm/detail/type_mat3x3.inl
+++ b/3rdparty/glm/glm/detail/type_mat3x3.inl
--- a/3rdparty/glm/glm/detail/type_mat3x4.hpp
+++ b/3rdparty/glm/glm/detail/type_mat3x4.hpp
--- a/3rdparty/glm/glm/detail/type_mat3x4.inl
+++ b/3rdparty/glm/glm/detail/type_mat3x4.inl
--- a/3rdparty/glm/glm/detail/type_mat4x2.hpp
+++ b/3rdparty/glm/glm/detail/type_mat4x2.hpp
--- a/3rdparty/glm/glm/detail/type_mat4x2.inl
+++ b/3rdparty/glm/glm/detail/type_mat4x2.inl
--- a/3rdparty/glm/glm/detail/type_mat4x3.hpp
+++ b/3rdparty/glm/glm/detail/type_mat4x3.hpp
--- a/3rdparty/glm/glm/detail/type_mat4x3.inl
+++ b/3rdparty/glm/glm/detail/type_mat4x3.inl
--- a/3rdparty/glm/glm/detail/type_mat4x4.hpp
+++ b/3rdparty/glm/glm/detail/type_mat4x4.hpp
--- a/3rdparty/glm/glm/detail/type_mat4x4.inl
+++ b/3rdparty/glm/glm/detail/type_mat4x4.inl
--- a/3rdparty/glm/glm/detail/type_vec.hpp
+++ b/3rdparty/glm/glm/detail/type_vec.hpp
--- a/3rdparty/glm/glm/detail/type_vec.inl
+++ b/3rdparty/glm/glm/detail/type_vec.inl
--- a/3rdparty/glm/glm/detail/type_vec1.hpp
+++ b/3rdparty/glm/glm/detail/type_vec1.hpp
--- a/3rdparty/glm/glm/detail/type_vec1.inl
+++ b/3rdparty/glm/glm/detail/type_vec1.inl
--- a/3rdparty/glm/glm/detail/type_vec2.hpp
+++ b/3rdparty/glm/glm/detail/type_vec2.hpp
--- a/3rdparty/glm/glm/detail/type_vec2.inl
+++ b/3rdparty/glm/glm/detail/type_vec2.inl
--- a/3rdparty/glm/glm/detail/type_vec3.hpp
+++ b/3rdparty/glm/glm/detail/type_vec3.hpp
--- a/3rdparty/glm/glm/detail/type_vec3.inl
+++ b/3rdparty/glm/glm/detail/type_vec3.inl
--- a/3rdparty/glm/glm/detail/type_vec4.hpp
+++ b/3rdparty/glm/glm/detail/type_vec4.hpp
--- a/3rdparty/glm/glm/detail/type_vec4.inl
+++ b/3rdparty/glm/glm/detail/type_vec4.inl
--- a/3rdparty/glm/glm/detail/type_vec4_avx.inl
+++ b/3rdparty/glm/glm/detail/type_vec4_avx.inl
--- a/3rdparty/glm/glm/detail/type_vec4_avx2.inl
+++ b/3rdparty/glm/glm/detail/type_vec4_avx2.inl
--- a/3rdparty/glm/glm/detail/type_vec4_sse2.inl
+++ b/3rdparty/glm/glm/detail/type_vec4_sse2.inl
--- a/3rdparty/glm/glm/exponential.hpp
+++ b/3rdparty/glm/glm/exponential.hpp
--- a/3rdparty/glm/glm/ext.hpp
+++ b/3rdparty/glm/glm/ext.hpp
--- a/3rdparty/glm/glm/fwd.hpp
+++ b/3rdparty/glm/glm/fwd.hpp
--- a/3rdparty/glm/glm/geometric.hpp
+++ b/3rdparty/glm/glm/geometric.hpp
--- a/3rdparty/glm/glm/glm.hpp
+++ b/3rdparty/glm/glm/glm.hpp
--- a/3rdparty/glm/glm/gtc/bitfield.hpp
+++ b/3rdparty/glm/glm/gtc/bitfield.hpp
--- a/3rdparty/glm/glm/gtc/bitfield.inl
+++ b/3rdparty/glm/glm/gtc/bitfield.inl
--- a/3rdparty/glm/glm/gtc/constants.hpp
+++ b/3rdparty/glm/glm/gtc/constants.hpp
--- a/3rdparty/glm/glm/gtc/constants.inl
+++ b/3rdparty/glm/glm/gtc/constants.inl
--- a/3rdparty/glm/glm/gtc/epsilon.hpp
+++ b/3rdparty/glm/glm/gtc/epsilon.hpp
--- a/Show More
+++ b/Show More