diff --git a/.gitmodules b/.gitmodules index 4782d23516..c72d8f71bf 100644 --- 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 diff --git a/.travis.yml b/.travis.yml index ab87819823..4d019dad18 100644 --- 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 diff --git a/GSL b/3rdparty/GSL similarity index 100% rename from GSL rename to 3rdparty/GSL diff --git a/glm/CMakeLists.txt b/3rdparty/glm/CMakeLists.txt similarity index 100% rename from glm/CMakeLists.txt rename to 3rdparty/glm/CMakeLists.txt diff --git a/glm/CTestConfig.cmake b/3rdparty/glm/CTestConfig.cmake similarity index 100% rename from glm/CTestConfig.cmake rename to 3rdparty/glm/CTestConfig.cmake diff --git a/glm/cmake/GNUInstallDirs.cmake b/3rdparty/glm/cmake/GNUInstallDirs.cmake similarity index 100% rename from glm/cmake/GNUInstallDirs.cmake rename to 3rdparty/glm/cmake/GNUInstallDirs.cmake diff --git a/glm/copying.txt b/3rdparty/glm/copying.txt similarity index 100% rename from glm/copying.txt rename to 3rdparty/glm/copying.txt diff --git a/glm/glm/CMakeLists.txt b/3rdparty/glm/glm/CMakeLists.txt similarity index 100% rename from glm/glm/CMakeLists.txt rename to 3rdparty/glm/glm/CMakeLists.txt diff --git a/glm/glm/common.hpp b/3rdparty/glm/glm/common.hpp similarity index 100% rename from glm/glm/common.hpp rename to 3rdparty/glm/glm/common.hpp diff --git a/glm/glm/detail/_features.hpp b/3rdparty/glm/glm/detail/_features.hpp similarity index 100% rename from glm/glm/detail/_features.hpp rename to 3rdparty/glm/glm/detail/_features.hpp diff --git a/glm/glm/detail/_fixes.hpp b/3rdparty/glm/glm/detail/_fixes.hpp similarity index 100% rename from glm/glm/detail/_fixes.hpp rename to 3rdparty/glm/glm/detail/_fixes.hpp diff --git a/glm/glm/detail/_noise.hpp b/3rdparty/glm/glm/detail/_noise.hpp similarity index 100% rename from glm/glm/detail/_noise.hpp rename to 3rdparty/glm/glm/detail/_noise.hpp diff --git a/glm/glm/detail/_swizzle.hpp b/3rdparty/glm/glm/detail/_swizzle.hpp similarity index 100% rename from glm/glm/detail/_swizzle.hpp rename to 3rdparty/glm/glm/detail/_swizzle.hpp diff --git a/glm/glm/detail/_swizzle_func.hpp b/3rdparty/glm/glm/detail/_swizzle_func.hpp similarity index 100% rename from glm/glm/detail/_swizzle_func.hpp rename to 3rdparty/glm/glm/detail/_swizzle_func.hpp diff --git a/glm/glm/detail/_vectorize.hpp b/3rdparty/glm/glm/detail/_vectorize.hpp similarity index 100% rename from glm/glm/detail/_vectorize.hpp rename to 3rdparty/glm/glm/detail/_vectorize.hpp diff --git a/glm/glm/detail/dummy.cpp b/3rdparty/glm/glm/detail/dummy.cpp similarity index 100% rename from glm/glm/detail/dummy.cpp rename to 3rdparty/glm/glm/detail/dummy.cpp diff --git a/glm/glm/detail/func_common.hpp b/3rdparty/glm/glm/detail/func_common.hpp similarity index 100% rename from glm/glm/detail/func_common.hpp rename to 3rdparty/glm/glm/detail/func_common.hpp diff --git a/glm/glm/detail/func_common.inl b/3rdparty/glm/glm/detail/func_common.inl similarity index 100% rename from glm/glm/detail/func_common.inl rename to 3rdparty/glm/glm/detail/func_common.inl diff --git a/glm/glm/detail/func_exponential.hpp b/3rdparty/glm/glm/detail/func_exponential.hpp similarity index 100% rename from glm/glm/detail/func_exponential.hpp rename to 3rdparty/glm/glm/detail/func_exponential.hpp diff --git a/glm/glm/detail/func_exponential.inl b/3rdparty/glm/glm/detail/func_exponential.inl similarity index 100% rename from glm/glm/detail/func_exponential.inl rename to 3rdparty/glm/glm/detail/func_exponential.inl diff --git a/glm/glm/detail/func_geometric.hpp b/3rdparty/glm/glm/detail/func_geometric.hpp similarity index 100% rename from glm/glm/detail/func_geometric.hpp rename to 3rdparty/glm/glm/detail/func_geometric.hpp diff --git a/glm/glm/detail/func_geometric.inl b/3rdparty/glm/glm/detail/func_geometric.inl similarity index 100% rename from glm/glm/detail/func_geometric.inl rename to 3rdparty/glm/glm/detail/func_geometric.inl diff --git a/glm/glm/detail/func_integer.hpp b/3rdparty/glm/glm/detail/func_integer.hpp similarity index 100% rename from glm/glm/detail/func_integer.hpp rename to 3rdparty/glm/glm/detail/func_integer.hpp diff --git a/glm/glm/detail/func_integer.inl b/3rdparty/glm/glm/detail/func_integer.inl similarity index 100% rename from glm/glm/detail/func_integer.inl rename to 3rdparty/glm/glm/detail/func_integer.inl diff --git a/glm/glm/detail/func_matrix.hpp b/3rdparty/glm/glm/detail/func_matrix.hpp similarity index 100% rename from glm/glm/detail/func_matrix.hpp rename to 3rdparty/glm/glm/detail/func_matrix.hpp diff --git a/glm/glm/detail/func_matrix.inl b/3rdparty/glm/glm/detail/func_matrix.inl similarity index 100% rename from glm/glm/detail/func_matrix.inl rename to 3rdparty/glm/glm/detail/func_matrix.inl diff --git a/glm/glm/detail/func_noise.hpp b/3rdparty/glm/glm/detail/func_noise.hpp similarity index 100% rename from glm/glm/detail/func_noise.hpp rename to 3rdparty/glm/glm/detail/func_noise.hpp diff --git a/glm/glm/detail/func_noise.inl b/3rdparty/glm/glm/detail/func_noise.inl similarity index 100% rename from glm/glm/detail/func_noise.inl rename to 3rdparty/glm/glm/detail/func_noise.inl diff --git a/glm/glm/detail/func_packing.hpp b/3rdparty/glm/glm/detail/func_packing.hpp similarity index 100% rename from glm/glm/detail/func_packing.hpp rename to 3rdparty/glm/glm/detail/func_packing.hpp diff --git a/glm/glm/detail/func_packing.inl b/3rdparty/glm/glm/detail/func_packing.inl similarity index 100% rename from glm/glm/detail/func_packing.inl rename to 3rdparty/glm/glm/detail/func_packing.inl diff --git a/glm/glm/detail/func_trigonometric.hpp b/3rdparty/glm/glm/detail/func_trigonometric.hpp similarity index 100% rename from glm/glm/detail/func_trigonometric.hpp rename to 3rdparty/glm/glm/detail/func_trigonometric.hpp diff --git a/glm/glm/detail/func_trigonometric.inl b/3rdparty/glm/glm/detail/func_trigonometric.inl similarity index 100% rename from glm/glm/detail/func_trigonometric.inl rename to 3rdparty/glm/glm/detail/func_trigonometric.inl diff --git a/glm/glm/detail/func_vector_relational.hpp b/3rdparty/glm/glm/detail/func_vector_relational.hpp similarity index 100% rename from glm/glm/detail/func_vector_relational.hpp rename to 3rdparty/glm/glm/detail/func_vector_relational.hpp diff --git a/glm/glm/detail/func_vector_relational.inl b/3rdparty/glm/glm/detail/func_vector_relational.inl similarity index 100% rename from glm/glm/detail/func_vector_relational.inl rename to 3rdparty/glm/glm/detail/func_vector_relational.inl diff --git a/glm/glm/detail/glm.cpp b/3rdparty/glm/glm/detail/glm.cpp similarity index 100% rename from glm/glm/detail/glm.cpp rename to 3rdparty/glm/glm/detail/glm.cpp diff --git a/glm/glm/detail/intrinsic_common.hpp b/3rdparty/glm/glm/detail/intrinsic_common.hpp similarity index 100% rename from glm/glm/detail/intrinsic_common.hpp rename to 3rdparty/glm/glm/detail/intrinsic_common.hpp diff --git a/glm/glm/detail/intrinsic_common.inl b/3rdparty/glm/glm/detail/intrinsic_common.inl similarity index 100% rename from glm/glm/detail/intrinsic_common.inl rename to 3rdparty/glm/glm/detail/intrinsic_common.inl diff --git a/glm/glm/detail/intrinsic_exponential.hpp b/3rdparty/glm/glm/detail/intrinsic_exponential.hpp similarity index 100% rename from glm/glm/detail/intrinsic_exponential.hpp rename to 3rdparty/glm/glm/detail/intrinsic_exponential.hpp diff --git a/glm/glm/detail/intrinsic_exponential.inl b/3rdparty/glm/glm/detail/intrinsic_exponential.inl similarity index 100% rename from glm/glm/detail/intrinsic_exponential.inl rename to 3rdparty/glm/glm/detail/intrinsic_exponential.inl diff --git a/glm/glm/detail/intrinsic_geometric.hpp b/3rdparty/glm/glm/detail/intrinsic_geometric.hpp similarity index 100% rename from glm/glm/detail/intrinsic_geometric.hpp rename to 3rdparty/glm/glm/detail/intrinsic_geometric.hpp diff --git a/glm/glm/detail/intrinsic_geometric.inl b/3rdparty/glm/glm/detail/intrinsic_geometric.inl similarity index 100% rename from glm/glm/detail/intrinsic_geometric.inl rename to 3rdparty/glm/glm/detail/intrinsic_geometric.inl diff --git a/glm/glm/detail/intrinsic_integer.hpp b/3rdparty/glm/glm/detail/intrinsic_integer.hpp similarity index 100% rename from glm/glm/detail/intrinsic_integer.hpp rename to 3rdparty/glm/glm/detail/intrinsic_integer.hpp diff --git a/glm/glm/detail/intrinsic_integer.inl b/3rdparty/glm/glm/detail/intrinsic_integer.inl similarity index 100% rename from glm/glm/detail/intrinsic_integer.inl rename to 3rdparty/glm/glm/detail/intrinsic_integer.inl diff --git a/glm/glm/detail/intrinsic_matrix.hpp b/3rdparty/glm/glm/detail/intrinsic_matrix.hpp similarity index 100% rename from glm/glm/detail/intrinsic_matrix.hpp rename to 3rdparty/glm/glm/detail/intrinsic_matrix.hpp diff --git a/glm/glm/detail/intrinsic_matrix.inl b/3rdparty/glm/glm/detail/intrinsic_matrix.inl similarity index 100% rename from glm/glm/detail/intrinsic_matrix.inl rename to 3rdparty/glm/glm/detail/intrinsic_matrix.inl diff --git a/glm/glm/detail/intrinsic_trigonometric.hpp b/3rdparty/glm/glm/detail/intrinsic_trigonometric.hpp similarity index 100% rename from glm/glm/detail/intrinsic_trigonometric.hpp rename to 3rdparty/glm/glm/detail/intrinsic_trigonometric.hpp diff --git a/glm/glm/detail/intrinsic_trigonometric.inl b/3rdparty/glm/glm/detail/intrinsic_trigonometric.inl similarity index 100% rename from glm/glm/detail/intrinsic_trigonometric.inl rename to 3rdparty/glm/glm/detail/intrinsic_trigonometric.inl diff --git a/glm/glm/detail/intrinsic_vector_relational.hpp b/3rdparty/glm/glm/detail/intrinsic_vector_relational.hpp similarity index 100% rename from glm/glm/detail/intrinsic_vector_relational.hpp rename to 3rdparty/glm/glm/detail/intrinsic_vector_relational.hpp diff --git a/glm/glm/detail/intrinsic_vector_relational.inl b/3rdparty/glm/glm/detail/intrinsic_vector_relational.inl similarity index 100% rename from glm/glm/detail/intrinsic_vector_relational.inl rename to 3rdparty/glm/glm/detail/intrinsic_vector_relational.inl diff --git a/glm/glm/detail/precision.hpp b/3rdparty/glm/glm/detail/precision.hpp similarity index 100% rename from glm/glm/detail/precision.hpp rename to 3rdparty/glm/glm/detail/precision.hpp diff --git a/glm/glm/detail/setup.hpp b/3rdparty/glm/glm/detail/setup.hpp similarity index 100% rename from glm/glm/detail/setup.hpp rename to 3rdparty/glm/glm/detail/setup.hpp diff --git a/glm/glm/detail/type_float.hpp b/3rdparty/glm/glm/detail/type_float.hpp similarity index 100% rename from glm/glm/detail/type_float.hpp rename to 3rdparty/glm/glm/detail/type_float.hpp diff --git a/glm/glm/detail/type_gentype.hpp b/3rdparty/glm/glm/detail/type_gentype.hpp similarity index 100% rename from glm/glm/detail/type_gentype.hpp rename to 3rdparty/glm/glm/detail/type_gentype.hpp diff --git a/glm/glm/detail/type_gentype.inl b/3rdparty/glm/glm/detail/type_gentype.inl similarity index 100% rename from glm/glm/detail/type_gentype.inl rename to 3rdparty/glm/glm/detail/type_gentype.inl diff --git a/glm/glm/detail/type_half.hpp b/3rdparty/glm/glm/detail/type_half.hpp similarity index 100% rename from glm/glm/detail/type_half.hpp rename to 3rdparty/glm/glm/detail/type_half.hpp diff --git a/glm/glm/detail/type_half.inl b/3rdparty/glm/glm/detail/type_half.inl similarity index 100% rename from glm/glm/detail/type_half.inl rename to 3rdparty/glm/glm/detail/type_half.inl diff --git a/glm/glm/detail/type_int.hpp b/3rdparty/glm/glm/detail/type_int.hpp similarity index 100% rename from glm/glm/detail/type_int.hpp rename to 3rdparty/glm/glm/detail/type_int.hpp diff --git a/glm/glm/detail/type_mat.hpp b/3rdparty/glm/glm/detail/type_mat.hpp similarity index 100% rename from glm/glm/detail/type_mat.hpp rename to 3rdparty/glm/glm/detail/type_mat.hpp diff --git a/glm/glm/detail/type_mat.inl b/3rdparty/glm/glm/detail/type_mat.inl similarity index 100% rename from glm/glm/detail/type_mat.inl rename to 3rdparty/glm/glm/detail/type_mat.inl diff --git a/glm/glm/detail/type_mat2x2.hpp b/3rdparty/glm/glm/detail/type_mat2x2.hpp similarity index 100% rename from glm/glm/detail/type_mat2x2.hpp rename to 3rdparty/glm/glm/detail/type_mat2x2.hpp diff --git a/glm/glm/detail/type_mat2x2.inl b/3rdparty/glm/glm/detail/type_mat2x2.inl similarity index 100% rename from glm/glm/detail/type_mat2x2.inl rename to 3rdparty/glm/glm/detail/type_mat2x2.inl diff --git a/glm/glm/detail/type_mat2x3.hpp b/3rdparty/glm/glm/detail/type_mat2x3.hpp similarity index 100% rename from glm/glm/detail/type_mat2x3.hpp rename to 3rdparty/glm/glm/detail/type_mat2x3.hpp diff --git a/glm/glm/detail/type_mat2x3.inl b/3rdparty/glm/glm/detail/type_mat2x3.inl similarity index 100% rename from glm/glm/detail/type_mat2x3.inl rename to 3rdparty/glm/glm/detail/type_mat2x3.inl diff --git a/glm/glm/detail/type_mat2x4.hpp b/3rdparty/glm/glm/detail/type_mat2x4.hpp similarity index 100% rename from glm/glm/detail/type_mat2x4.hpp rename to 3rdparty/glm/glm/detail/type_mat2x4.hpp diff --git a/glm/glm/detail/type_mat2x4.inl b/3rdparty/glm/glm/detail/type_mat2x4.inl similarity index 100% rename from glm/glm/detail/type_mat2x4.inl rename to 3rdparty/glm/glm/detail/type_mat2x4.inl diff --git a/glm/glm/detail/type_mat3x2.hpp b/3rdparty/glm/glm/detail/type_mat3x2.hpp similarity index 100% rename from glm/glm/detail/type_mat3x2.hpp rename to 3rdparty/glm/glm/detail/type_mat3x2.hpp diff --git a/glm/glm/detail/type_mat3x2.inl b/3rdparty/glm/glm/detail/type_mat3x2.inl similarity index 100% rename from glm/glm/detail/type_mat3x2.inl rename to 3rdparty/glm/glm/detail/type_mat3x2.inl diff --git a/glm/glm/detail/type_mat3x3.hpp b/3rdparty/glm/glm/detail/type_mat3x3.hpp similarity index 100% rename from glm/glm/detail/type_mat3x3.hpp rename to 3rdparty/glm/glm/detail/type_mat3x3.hpp diff --git a/glm/glm/detail/type_mat3x3.inl b/3rdparty/glm/glm/detail/type_mat3x3.inl similarity index 100% rename from glm/glm/detail/type_mat3x3.inl rename to 3rdparty/glm/glm/detail/type_mat3x3.inl diff --git a/glm/glm/detail/type_mat3x4.hpp b/3rdparty/glm/glm/detail/type_mat3x4.hpp similarity index 100% rename from glm/glm/detail/type_mat3x4.hpp rename to 3rdparty/glm/glm/detail/type_mat3x4.hpp diff --git a/glm/glm/detail/type_mat3x4.inl b/3rdparty/glm/glm/detail/type_mat3x4.inl similarity index 100% rename from glm/glm/detail/type_mat3x4.inl rename to 3rdparty/glm/glm/detail/type_mat3x4.inl diff --git a/glm/glm/detail/type_mat4x2.hpp b/3rdparty/glm/glm/detail/type_mat4x2.hpp similarity index 100% rename from glm/glm/detail/type_mat4x2.hpp rename to 3rdparty/glm/glm/detail/type_mat4x2.hpp diff --git a/glm/glm/detail/type_mat4x2.inl b/3rdparty/glm/glm/detail/type_mat4x2.inl similarity index 100% rename from glm/glm/detail/type_mat4x2.inl rename to 3rdparty/glm/glm/detail/type_mat4x2.inl diff --git a/glm/glm/detail/type_mat4x3.hpp b/3rdparty/glm/glm/detail/type_mat4x3.hpp similarity index 100% rename from glm/glm/detail/type_mat4x3.hpp rename to 3rdparty/glm/glm/detail/type_mat4x3.hpp diff --git a/glm/glm/detail/type_mat4x3.inl b/3rdparty/glm/glm/detail/type_mat4x3.inl similarity index 100% rename from glm/glm/detail/type_mat4x3.inl rename to 3rdparty/glm/glm/detail/type_mat4x3.inl diff --git a/glm/glm/detail/type_mat4x4.hpp b/3rdparty/glm/glm/detail/type_mat4x4.hpp similarity index 100% rename from glm/glm/detail/type_mat4x4.hpp rename to 3rdparty/glm/glm/detail/type_mat4x4.hpp diff --git a/glm/glm/detail/type_mat4x4.inl b/3rdparty/glm/glm/detail/type_mat4x4.inl similarity index 100% rename from glm/glm/detail/type_mat4x4.inl rename to 3rdparty/glm/glm/detail/type_mat4x4.inl diff --git a/glm/glm/detail/type_vec.hpp b/3rdparty/glm/glm/detail/type_vec.hpp similarity index 100% rename from glm/glm/detail/type_vec.hpp rename to 3rdparty/glm/glm/detail/type_vec.hpp diff --git a/glm/glm/detail/type_vec.inl b/3rdparty/glm/glm/detail/type_vec.inl similarity index 100% rename from glm/glm/detail/type_vec.inl rename to 3rdparty/glm/glm/detail/type_vec.inl diff --git a/glm/glm/detail/type_vec1.hpp b/3rdparty/glm/glm/detail/type_vec1.hpp similarity index 100% rename from glm/glm/detail/type_vec1.hpp rename to 3rdparty/glm/glm/detail/type_vec1.hpp diff --git a/glm/glm/detail/type_vec1.inl b/3rdparty/glm/glm/detail/type_vec1.inl similarity index 100% rename from glm/glm/detail/type_vec1.inl rename to 3rdparty/glm/glm/detail/type_vec1.inl diff --git a/glm/glm/detail/type_vec2.hpp b/3rdparty/glm/glm/detail/type_vec2.hpp similarity index 100% rename from glm/glm/detail/type_vec2.hpp rename to 3rdparty/glm/glm/detail/type_vec2.hpp diff --git a/glm/glm/detail/type_vec2.inl b/3rdparty/glm/glm/detail/type_vec2.inl similarity index 100% rename from glm/glm/detail/type_vec2.inl rename to 3rdparty/glm/glm/detail/type_vec2.inl diff --git a/glm/glm/detail/type_vec3.hpp b/3rdparty/glm/glm/detail/type_vec3.hpp similarity index 100% rename from glm/glm/detail/type_vec3.hpp rename to 3rdparty/glm/glm/detail/type_vec3.hpp diff --git a/glm/glm/detail/type_vec3.inl b/3rdparty/glm/glm/detail/type_vec3.inl similarity index 100% rename from glm/glm/detail/type_vec3.inl rename to 3rdparty/glm/glm/detail/type_vec3.inl diff --git a/glm/glm/detail/type_vec4.hpp b/3rdparty/glm/glm/detail/type_vec4.hpp similarity index 100% rename from glm/glm/detail/type_vec4.hpp rename to 3rdparty/glm/glm/detail/type_vec4.hpp diff --git a/glm/glm/detail/type_vec4.inl b/3rdparty/glm/glm/detail/type_vec4.inl similarity index 100% rename from glm/glm/detail/type_vec4.inl rename to 3rdparty/glm/glm/detail/type_vec4.inl diff --git a/glm/glm/detail/type_vec4_avx.inl b/3rdparty/glm/glm/detail/type_vec4_avx.inl similarity index 100% rename from glm/glm/detail/type_vec4_avx.inl rename to 3rdparty/glm/glm/detail/type_vec4_avx.inl diff --git a/glm/glm/detail/type_vec4_avx2.inl b/3rdparty/glm/glm/detail/type_vec4_avx2.inl similarity index 100% rename from glm/glm/detail/type_vec4_avx2.inl rename to 3rdparty/glm/glm/detail/type_vec4_avx2.inl diff --git a/glm/glm/detail/type_vec4_sse2.inl b/3rdparty/glm/glm/detail/type_vec4_sse2.inl similarity index 100% rename from glm/glm/detail/type_vec4_sse2.inl rename to 3rdparty/glm/glm/detail/type_vec4_sse2.inl diff --git a/glm/glm/exponential.hpp b/3rdparty/glm/glm/exponential.hpp similarity index 100% rename from glm/glm/exponential.hpp rename to 3rdparty/glm/glm/exponential.hpp diff --git a/glm/glm/ext.hpp b/3rdparty/glm/glm/ext.hpp similarity index 100% rename from glm/glm/ext.hpp rename to 3rdparty/glm/glm/ext.hpp diff --git a/glm/glm/fwd.hpp b/3rdparty/glm/glm/fwd.hpp similarity index 100% rename from glm/glm/fwd.hpp rename to 3rdparty/glm/glm/fwd.hpp diff --git a/glm/glm/geometric.hpp b/3rdparty/glm/glm/geometric.hpp similarity index 100% rename from glm/glm/geometric.hpp rename to 3rdparty/glm/glm/geometric.hpp diff --git a/glm/glm/glm.hpp b/3rdparty/glm/glm/glm.hpp similarity index 100% rename from glm/glm/glm.hpp rename to 3rdparty/glm/glm/glm.hpp diff --git a/glm/glm/gtc/bitfield.hpp b/3rdparty/glm/glm/gtc/bitfield.hpp similarity index 100% rename from glm/glm/gtc/bitfield.hpp rename to 3rdparty/glm/glm/gtc/bitfield.hpp diff --git a/glm/glm/gtc/bitfield.inl b/3rdparty/glm/glm/gtc/bitfield.inl similarity index 100% rename from glm/glm/gtc/bitfield.inl rename to 3rdparty/glm/glm/gtc/bitfield.inl diff --git a/glm/glm/gtc/constants.hpp b/3rdparty/glm/glm/gtc/constants.hpp similarity index 100% rename from glm/glm/gtc/constants.hpp rename to 3rdparty/glm/glm/gtc/constants.hpp diff --git a/glm/glm/gtc/constants.inl b/3rdparty/glm/glm/gtc/constants.inl similarity index 100% rename from glm/glm/gtc/constants.inl rename to 3rdparty/glm/glm/gtc/constants.inl diff --git a/glm/glm/gtc/epsilon.hpp b/3rdparty/glm/glm/gtc/epsilon.hpp similarity index 100% rename from glm/glm/gtc/epsilon.hpp rename to 3rdparty/glm/glm/gtc/epsilon.hpp diff --git a/glm/glm/gtc/epsilon.inl b/3rdparty/glm/glm/gtc/epsilon.inl similarity index 100% rename from glm/glm/gtc/epsilon.inl rename to 3rdparty/glm/glm/gtc/epsilon.inl diff --git a/glm/glm/gtc/integer.hpp b/3rdparty/glm/glm/gtc/integer.hpp similarity index 100% rename from glm/glm/gtc/integer.hpp rename to 3rdparty/glm/glm/gtc/integer.hpp diff --git a/glm/glm/gtc/integer.inl b/3rdparty/glm/glm/gtc/integer.inl similarity index 100% rename from glm/glm/gtc/integer.inl rename to 3rdparty/glm/glm/gtc/integer.inl diff --git a/glm/glm/gtc/matrix_access.hpp b/3rdparty/glm/glm/gtc/matrix_access.hpp similarity index 100% rename from glm/glm/gtc/matrix_access.hpp rename to 3rdparty/glm/glm/gtc/matrix_access.hpp diff --git a/glm/glm/gtc/matrix_access.inl b/3rdparty/glm/glm/gtc/matrix_access.inl similarity index 100% rename from glm/glm/gtc/matrix_access.inl rename to 3rdparty/glm/glm/gtc/matrix_access.inl diff --git a/glm/glm/gtc/matrix_integer.hpp b/3rdparty/glm/glm/gtc/matrix_integer.hpp similarity index 100% rename from glm/glm/gtc/matrix_integer.hpp rename to 3rdparty/glm/glm/gtc/matrix_integer.hpp diff --git a/glm/glm/gtc/matrix_inverse.hpp b/3rdparty/glm/glm/gtc/matrix_inverse.hpp similarity index 100% rename from glm/glm/gtc/matrix_inverse.hpp rename to 3rdparty/glm/glm/gtc/matrix_inverse.hpp diff --git a/glm/glm/gtc/matrix_inverse.inl b/3rdparty/glm/glm/gtc/matrix_inverse.inl similarity index 100% rename from glm/glm/gtc/matrix_inverse.inl rename to 3rdparty/glm/glm/gtc/matrix_inverse.inl diff --git a/glm/glm/gtc/matrix_transform.hpp b/3rdparty/glm/glm/gtc/matrix_transform.hpp similarity index 100% rename from glm/glm/gtc/matrix_transform.hpp rename to 3rdparty/glm/glm/gtc/matrix_transform.hpp diff --git a/glm/glm/gtc/matrix_transform.inl b/3rdparty/glm/glm/gtc/matrix_transform.inl similarity index 100% rename from glm/glm/gtc/matrix_transform.inl rename to 3rdparty/glm/glm/gtc/matrix_transform.inl diff --git a/glm/glm/gtc/noise.hpp b/3rdparty/glm/glm/gtc/noise.hpp similarity index 100% rename from glm/glm/gtc/noise.hpp rename to 3rdparty/glm/glm/gtc/noise.hpp diff --git a/glm/glm/gtc/noise.inl b/3rdparty/glm/glm/gtc/noise.inl similarity index 100% rename from glm/glm/gtc/noise.inl rename to 3rdparty/glm/glm/gtc/noise.inl diff --git a/glm/glm/gtc/packing.hpp b/3rdparty/glm/glm/gtc/packing.hpp similarity index 100% rename from glm/glm/gtc/packing.hpp rename to 3rdparty/glm/glm/gtc/packing.hpp diff --git a/glm/glm/gtc/packing.inl b/3rdparty/glm/glm/gtc/packing.inl similarity index 100% rename from glm/glm/gtc/packing.inl rename to 3rdparty/glm/glm/gtc/packing.inl diff --git a/glm/glm/gtc/quaternion.hpp b/3rdparty/glm/glm/gtc/quaternion.hpp similarity index 100% rename from glm/glm/gtc/quaternion.hpp rename to 3rdparty/glm/glm/gtc/quaternion.hpp diff --git a/glm/glm/gtc/quaternion.inl b/3rdparty/glm/glm/gtc/quaternion.inl similarity index 100% rename from glm/glm/gtc/quaternion.inl rename to 3rdparty/glm/glm/gtc/quaternion.inl diff --git a/glm/glm/gtc/random.hpp b/3rdparty/glm/glm/gtc/random.hpp similarity index 100% rename from glm/glm/gtc/random.hpp rename to 3rdparty/glm/glm/gtc/random.hpp diff --git a/glm/glm/gtc/random.inl b/3rdparty/glm/glm/gtc/random.inl similarity index 100% rename from glm/glm/gtc/random.inl rename to 3rdparty/glm/glm/gtc/random.inl diff --git a/glm/glm/gtc/reciprocal.hpp b/3rdparty/glm/glm/gtc/reciprocal.hpp similarity index 100% rename from glm/glm/gtc/reciprocal.hpp rename to 3rdparty/glm/glm/gtc/reciprocal.hpp diff --git a/glm/glm/gtc/reciprocal.inl b/3rdparty/glm/glm/gtc/reciprocal.inl similarity index 100% rename from glm/glm/gtc/reciprocal.inl rename to 3rdparty/glm/glm/gtc/reciprocal.inl diff --git a/glm/glm/gtc/round.hpp b/3rdparty/glm/glm/gtc/round.hpp similarity index 100% rename from glm/glm/gtc/round.hpp rename to 3rdparty/glm/glm/gtc/round.hpp diff --git a/glm/glm/gtc/round.inl b/3rdparty/glm/glm/gtc/round.inl similarity index 100% rename from glm/glm/gtc/round.inl rename to 3rdparty/glm/glm/gtc/round.inl diff --git a/glm/glm/gtc/type_precision.hpp b/3rdparty/glm/glm/gtc/type_precision.hpp similarity index 100% rename from glm/glm/gtc/type_precision.hpp rename to 3rdparty/glm/glm/gtc/type_precision.hpp diff --git a/glm/glm/gtc/type_precision.inl b/3rdparty/glm/glm/gtc/type_precision.inl similarity index 100% rename from glm/glm/gtc/type_precision.inl rename to 3rdparty/glm/glm/gtc/type_precision.inl diff --git a/glm/glm/gtc/type_ptr.hpp b/3rdparty/glm/glm/gtc/type_ptr.hpp similarity index 100% rename from glm/glm/gtc/type_ptr.hpp rename to 3rdparty/glm/glm/gtc/type_ptr.hpp diff --git a/glm/glm/gtc/type_ptr.inl b/3rdparty/glm/glm/gtc/type_ptr.inl similarity index 100% rename from glm/glm/gtc/type_ptr.inl rename to 3rdparty/glm/glm/gtc/type_ptr.inl diff --git a/glm/glm/gtc/ulp.hpp b/3rdparty/glm/glm/gtc/ulp.hpp similarity index 100% rename from glm/glm/gtc/ulp.hpp rename to 3rdparty/glm/glm/gtc/ulp.hpp diff --git a/glm/glm/gtc/ulp.inl b/3rdparty/glm/glm/gtc/ulp.inl similarity index 100% rename from glm/glm/gtc/ulp.inl rename to 3rdparty/glm/glm/gtc/ulp.inl diff --git a/glm/glm/gtc/vec1.hpp b/3rdparty/glm/glm/gtc/vec1.hpp similarity index 100% rename from glm/glm/gtc/vec1.hpp rename to 3rdparty/glm/glm/gtc/vec1.hpp diff --git a/glm/glm/gtc/vec1.inl b/3rdparty/glm/glm/gtc/vec1.inl similarity index 100% rename from glm/glm/gtc/vec1.inl rename to 3rdparty/glm/glm/gtc/vec1.inl diff --git a/glm/glm/gtx/associated_min_max.hpp b/3rdparty/glm/glm/gtx/associated_min_max.hpp similarity index 100% rename from glm/glm/gtx/associated_min_max.hpp rename to 3rdparty/glm/glm/gtx/associated_min_max.hpp diff --git a/glm/glm/gtx/associated_min_max.inl b/3rdparty/glm/glm/gtx/associated_min_max.inl similarity index 100% rename from glm/glm/gtx/associated_min_max.inl rename to 3rdparty/glm/glm/gtx/associated_min_max.inl diff --git a/glm/glm/gtx/bit.hpp b/3rdparty/glm/glm/gtx/bit.hpp similarity index 100% rename from glm/glm/gtx/bit.hpp rename to 3rdparty/glm/glm/gtx/bit.hpp diff --git a/glm/glm/gtx/bit.inl b/3rdparty/glm/glm/gtx/bit.inl similarity index 100% rename from glm/glm/gtx/bit.inl rename to 3rdparty/glm/glm/gtx/bit.inl diff --git a/glm/glm/gtx/closest_point.hpp b/3rdparty/glm/glm/gtx/closest_point.hpp similarity index 100% rename from glm/glm/gtx/closest_point.hpp rename to 3rdparty/glm/glm/gtx/closest_point.hpp diff --git a/glm/glm/gtx/closest_point.inl b/3rdparty/glm/glm/gtx/closest_point.inl similarity index 100% rename from glm/glm/gtx/closest_point.inl rename to 3rdparty/glm/glm/gtx/closest_point.inl diff --git a/glm/glm/gtx/color_space.hpp b/3rdparty/glm/glm/gtx/color_space.hpp similarity index 100% rename from glm/glm/gtx/color_space.hpp rename to 3rdparty/glm/glm/gtx/color_space.hpp diff --git a/glm/glm/gtx/color_space.inl b/3rdparty/glm/glm/gtx/color_space.inl similarity index 100% rename from glm/glm/gtx/color_space.inl rename to 3rdparty/glm/glm/gtx/color_space.inl diff --git a/glm/glm/gtx/color_space_YCoCg.hpp b/3rdparty/glm/glm/gtx/color_space_YCoCg.hpp similarity index 100% rename from glm/glm/gtx/color_space_YCoCg.hpp rename to 3rdparty/glm/glm/gtx/color_space_YCoCg.hpp diff --git a/glm/glm/gtx/color_space_YCoCg.inl b/3rdparty/glm/glm/gtx/color_space_YCoCg.inl similarity index 100% rename from glm/glm/gtx/color_space_YCoCg.inl rename to 3rdparty/glm/glm/gtx/color_space_YCoCg.inl diff --git a/glm/glm/gtx/common.hpp b/3rdparty/glm/glm/gtx/common.hpp similarity index 100% rename from glm/glm/gtx/common.hpp rename to 3rdparty/glm/glm/gtx/common.hpp diff --git a/glm/glm/gtx/common.inl b/3rdparty/glm/glm/gtx/common.inl similarity index 100% rename from glm/glm/gtx/common.inl rename to 3rdparty/glm/glm/gtx/common.inl diff --git a/glm/glm/gtx/compatibility.hpp b/3rdparty/glm/glm/gtx/compatibility.hpp similarity index 100% rename from glm/glm/gtx/compatibility.hpp rename to 3rdparty/glm/glm/gtx/compatibility.hpp diff --git a/glm/glm/gtx/compatibility.inl b/3rdparty/glm/glm/gtx/compatibility.inl similarity index 100% rename from glm/glm/gtx/compatibility.inl rename to 3rdparty/glm/glm/gtx/compatibility.inl diff --git a/glm/glm/gtx/component_wise.hpp b/3rdparty/glm/glm/gtx/component_wise.hpp similarity index 100% rename from glm/glm/gtx/component_wise.hpp rename to 3rdparty/glm/glm/gtx/component_wise.hpp diff --git a/glm/glm/gtx/component_wise.inl b/3rdparty/glm/glm/gtx/component_wise.inl similarity index 100% rename from glm/glm/gtx/component_wise.inl rename to 3rdparty/glm/glm/gtx/component_wise.inl diff --git a/glm/glm/gtx/dual_quaternion.hpp b/3rdparty/glm/glm/gtx/dual_quaternion.hpp similarity index 100% rename from glm/glm/gtx/dual_quaternion.hpp rename to 3rdparty/glm/glm/gtx/dual_quaternion.hpp diff --git a/glm/glm/gtx/dual_quaternion.inl b/3rdparty/glm/glm/gtx/dual_quaternion.inl similarity index 100% rename from glm/glm/gtx/dual_quaternion.inl rename to 3rdparty/glm/glm/gtx/dual_quaternion.inl diff --git a/glm/glm/gtx/euler_angles.hpp b/3rdparty/glm/glm/gtx/euler_angles.hpp similarity index 100% rename from glm/glm/gtx/euler_angles.hpp rename to 3rdparty/glm/glm/gtx/euler_angles.hpp diff --git a/glm/glm/gtx/euler_angles.inl b/3rdparty/glm/glm/gtx/euler_angles.inl similarity index 100% rename from glm/glm/gtx/euler_angles.inl rename to 3rdparty/glm/glm/gtx/euler_angles.inl diff --git a/glm/glm/gtx/extend.hpp b/3rdparty/glm/glm/gtx/extend.hpp similarity index 100% rename from glm/glm/gtx/extend.hpp rename to 3rdparty/glm/glm/gtx/extend.hpp diff --git a/glm/glm/gtx/extend.inl b/3rdparty/glm/glm/gtx/extend.inl similarity index 100% rename from glm/glm/gtx/extend.inl rename to 3rdparty/glm/glm/gtx/extend.inl diff --git a/glm/glm/gtx/extented_min_max.hpp b/3rdparty/glm/glm/gtx/extented_min_max.hpp similarity index 100% rename from glm/glm/gtx/extented_min_max.hpp rename to 3rdparty/glm/glm/gtx/extented_min_max.hpp diff --git a/glm/glm/gtx/extented_min_max.inl b/3rdparty/glm/glm/gtx/extented_min_max.inl similarity index 100% rename from glm/glm/gtx/extented_min_max.inl rename to 3rdparty/glm/glm/gtx/extented_min_max.inl diff --git a/glm/glm/gtx/fast_exponential.hpp b/3rdparty/glm/glm/gtx/fast_exponential.hpp similarity index 100% rename from glm/glm/gtx/fast_exponential.hpp rename to 3rdparty/glm/glm/gtx/fast_exponential.hpp diff --git a/glm/glm/gtx/fast_exponential.inl b/3rdparty/glm/glm/gtx/fast_exponential.inl similarity index 100% rename from glm/glm/gtx/fast_exponential.inl rename to 3rdparty/glm/glm/gtx/fast_exponential.inl diff --git a/glm/glm/gtx/fast_square_root.hpp b/3rdparty/glm/glm/gtx/fast_square_root.hpp similarity index 100% rename from glm/glm/gtx/fast_square_root.hpp rename to 3rdparty/glm/glm/gtx/fast_square_root.hpp diff --git a/glm/glm/gtx/fast_square_root.inl b/3rdparty/glm/glm/gtx/fast_square_root.inl similarity index 100% rename from glm/glm/gtx/fast_square_root.inl rename to 3rdparty/glm/glm/gtx/fast_square_root.inl diff --git a/glm/glm/gtx/fast_trigonometry.hpp b/3rdparty/glm/glm/gtx/fast_trigonometry.hpp similarity index 100% rename from glm/glm/gtx/fast_trigonometry.hpp rename to 3rdparty/glm/glm/gtx/fast_trigonometry.hpp diff --git a/glm/glm/gtx/fast_trigonometry.inl b/3rdparty/glm/glm/gtx/fast_trigonometry.inl similarity index 100% rename from glm/glm/gtx/fast_trigonometry.inl rename to 3rdparty/glm/glm/gtx/fast_trigonometry.inl diff --git a/glm/glm/gtx/gradient_paint.hpp b/3rdparty/glm/glm/gtx/gradient_paint.hpp similarity index 100% rename from glm/glm/gtx/gradient_paint.hpp rename to 3rdparty/glm/glm/gtx/gradient_paint.hpp diff --git a/glm/glm/gtx/gradient_paint.inl b/3rdparty/glm/glm/gtx/gradient_paint.inl similarity index 100% rename from glm/glm/gtx/gradient_paint.inl rename to 3rdparty/glm/glm/gtx/gradient_paint.inl diff --git a/glm/glm/gtx/handed_coordinate_space.hpp b/3rdparty/glm/glm/gtx/handed_coordinate_space.hpp similarity index 100% rename from glm/glm/gtx/handed_coordinate_space.hpp rename to 3rdparty/glm/glm/gtx/handed_coordinate_space.hpp diff --git a/glm/glm/gtx/handed_coordinate_space.inl b/3rdparty/glm/glm/gtx/handed_coordinate_space.inl similarity index 100% rename from glm/glm/gtx/handed_coordinate_space.inl rename to 3rdparty/glm/glm/gtx/handed_coordinate_space.inl diff --git a/glm/glm/gtx/integer.hpp b/3rdparty/glm/glm/gtx/integer.hpp similarity index 100% rename from glm/glm/gtx/integer.hpp rename to 3rdparty/glm/glm/gtx/integer.hpp diff --git a/glm/glm/gtx/integer.inl b/3rdparty/glm/glm/gtx/integer.inl similarity index 100% rename from glm/glm/gtx/integer.inl rename to 3rdparty/glm/glm/gtx/integer.inl diff --git a/glm/glm/gtx/intersect.hpp b/3rdparty/glm/glm/gtx/intersect.hpp similarity index 100% rename from glm/glm/gtx/intersect.hpp rename to 3rdparty/glm/glm/gtx/intersect.hpp diff --git a/glm/glm/gtx/intersect.inl b/3rdparty/glm/glm/gtx/intersect.inl similarity index 100% rename from glm/glm/gtx/intersect.inl rename to 3rdparty/glm/glm/gtx/intersect.inl diff --git a/glm/glm/gtx/io.hpp b/3rdparty/glm/glm/gtx/io.hpp similarity index 100% rename from glm/glm/gtx/io.hpp rename to 3rdparty/glm/glm/gtx/io.hpp diff --git a/glm/glm/gtx/io.inl b/3rdparty/glm/glm/gtx/io.inl similarity index 100% rename from glm/glm/gtx/io.inl rename to 3rdparty/glm/glm/gtx/io.inl diff --git a/glm/glm/gtx/log_base.hpp b/3rdparty/glm/glm/gtx/log_base.hpp similarity index 100% rename from glm/glm/gtx/log_base.hpp rename to 3rdparty/glm/glm/gtx/log_base.hpp diff --git a/glm/glm/gtx/log_base.inl b/3rdparty/glm/glm/gtx/log_base.inl similarity index 100% rename from glm/glm/gtx/log_base.inl rename to 3rdparty/glm/glm/gtx/log_base.inl diff --git a/glm/glm/gtx/matrix_cross_product.hpp b/3rdparty/glm/glm/gtx/matrix_cross_product.hpp similarity index 100% rename from glm/glm/gtx/matrix_cross_product.hpp rename to 3rdparty/glm/glm/gtx/matrix_cross_product.hpp diff --git a/glm/glm/gtx/matrix_cross_product.inl b/3rdparty/glm/glm/gtx/matrix_cross_product.inl similarity index 100% rename from glm/glm/gtx/matrix_cross_product.inl rename to 3rdparty/glm/glm/gtx/matrix_cross_product.inl diff --git a/glm/glm/gtx/matrix_decompose.hpp b/3rdparty/glm/glm/gtx/matrix_decompose.hpp similarity index 100% rename from glm/glm/gtx/matrix_decompose.hpp rename to 3rdparty/glm/glm/gtx/matrix_decompose.hpp diff --git a/glm/glm/gtx/matrix_decompose.inl b/3rdparty/glm/glm/gtx/matrix_decompose.inl similarity index 100% rename from glm/glm/gtx/matrix_decompose.inl rename to 3rdparty/glm/glm/gtx/matrix_decompose.inl diff --git a/glm/glm/gtx/matrix_interpolation.hpp b/3rdparty/glm/glm/gtx/matrix_interpolation.hpp similarity index 100% rename from glm/glm/gtx/matrix_interpolation.hpp rename to 3rdparty/glm/glm/gtx/matrix_interpolation.hpp diff --git a/glm/glm/gtx/matrix_interpolation.inl b/3rdparty/glm/glm/gtx/matrix_interpolation.inl similarity index 100% rename from glm/glm/gtx/matrix_interpolation.inl rename to 3rdparty/glm/glm/gtx/matrix_interpolation.inl diff --git a/glm/glm/gtx/matrix_major_storage.hpp b/3rdparty/glm/glm/gtx/matrix_major_storage.hpp similarity index 100% rename from glm/glm/gtx/matrix_major_storage.hpp rename to 3rdparty/glm/glm/gtx/matrix_major_storage.hpp diff --git a/glm/glm/gtx/matrix_major_storage.inl b/3rdparty/glm/glm/gtx/matrix_major_storage.inl similarity index 100% rename from glm/glm/gtx/matrix_major_storage.inl rename to 3rdparty/glm/glm/gtx/matrix_major_storage.inl diff --git a/glm/glm/gtx/matrix_operation.hpp b/3rdparty/glm/glm/gtx/matrix_operation.hpp similarity index 100% rename from glm/glm/gtx/matrix_operation.hpp rename to 3rdparty/glm/glm/gtx/matrix_operation.hpp diff --git a/glm/glm/gtx/matrix_operation.inl b/3rdparty/glm/glm/gtx/matrix_operation.inl similarity index 100% rename from glm/glm/gtx/matrix_operation.inl rename to 3rdparty/glm/glm/gtx/matrix_operation.inl diff --git a/glm/glm/gtx/matrix_query.hpp b/3rdparty/glm/glm/gtx/matrix_query.hpp similarity index 100% rename from glm/glm/gtx/matrix_query.hpp rename to 3rdparty/glm/glm/gtx/matrix_query.hpp diff --git a/glm/glm/gtx/matrix_query.inl b/3rdparty/glm/glm/gtx/matrix_query.inl similarity index 100% rename from glm/glm/gtx/matrix_query.inl rename to 3rdparty/glm/glm/gtx/matrix_query.inl diff --git a/glm/glm/gtx/matrix_transform_2d.hpp b/3rdparty/glm/glm/gtx/matrix_transform_2d.hpp similarity index 100% rename from glm/glm/gtx/matrix_transform_2d.hpp rename to 3rdparty/glm/glm/gtx/matrix_transform_2d.hpp diff --git a/glm/glm/gtx/matrix_transform_2d.inl b/3rdparty/glm/glm/gtx/matrix_transform_2d.inl similarity index 100% rename from glm/glm/gtx/matrix_transform_2d.inl rename to 3rdparty/glm/glm/gtx/matrix_transform_2d.inl diff --git a/glm/glm/gtx/mixed_product.hpp b/3rdparty/glm/glm/gtx/mixed_product.hpp similarity index 100% rename from glm/glm/gtx/mixed_product.hpp rename to 3rdparty/glm/glm/gtx/mixed_product.hpp diff --git a/glm/glm/gtx/mixed_product.inl b/3rdparty/glm/glm/gtx/mixed_product.inl similarity index 100% rename from glm/glm/gtx/mixed_product.inl rename to 3rdparty/glm/glm/gtx/mixed_product.inl diff --git a/glm/glm/gtx/multiple.hpp b/3rdparty/glm/glm/gtx/multiple.hpp similarity index 100% rename from glm/glm/gtx/multiple.hpp rename to 3rdparty/glm/glm/gtx/multiple.hpp diff --git a/glm/glm/gtx/multiple.inl b/3rdparty/glm/glm/gtx/multiple.inl similarity index 100% rename from glm/glm/gtx/multiple.inl rename to 3rdparty/glm/glm/gtx/multiple.inl diff --git a/glm/glm/gtx/norm.hpp b/3rdparty/glm/glm/gtx/norm.hpp similarity index 100% rename from glm/glm/gtx/norm.hpp rename to 3rdparty/glm/glm/gtx/norm.hpp diff --git a/glm/glm/gtx/norm.inl b/3rdparty/glm/glm/gtx/norm.inl similarity index 100% rename from glm/glm/gtx/norm.inl rename to 3rdparty/glm/glm/gtx/norm.inl diff --git a/glm/glm/gtx/normal.hpp b/3rdparty/glm/glm/gtx/normal.hpp similarity index 100% rename from glm/glm/gtx/normal.hpp rename to 3rdparty/glm/glm/gtx/normal.hpp diff --git a/glm/glm/gtx/normal.inl b/3rdparty/glm/glm/gtx/normal.inl similarity index 100% rename from glm/glm/gtx/normal.inl rename to 3rdparty/glm/glm/gtx/normal.inl diff --git a/glm/glm/gtx/normalize_dot.hpp b/3rdparty/glm/glm/gtx/normalize_dot.hpp similarity index 100% rename from glm/glm/gtx/normalize_dot.hpp rename to 3rdparty/glm/glm/gtx/normalize_dot.hpp diff --git a/glm/glm/gtx/normalize_dot.inl b/3rdparty/glm/glm/gtx/normalize_dot.inl similarity index 100% rename from glm/glm/gtx/normalize_dot.inl rename to 3rdparty/glm/glm/gtx/normalize_dot.inl diff --git a/glm/glm/gtx/number_precision.hpp b/3rdparty/glm/glm/gtx/number_precision.hpp similarity index 100% rename from glm/glm/gtx/number_precision.hpp rename to 3rdparty/glm/glm/gtx/number_precision.hpp diff --git a/glm/glm/gtx/number_precision.inl b/3rdparty/glm/glm/gtx/number_precision.inl similarity index 100% rename from glm/glm/gtx/number_precision.inl rename to 3rdparty/glm/glm/gtx/number_precision.inl diff --git a/glm/glm/gtx/optimum_pow.hpp b/3rdparty/glm/glm/gtx/optimum_pow.hpp similarity index 100% rename from glm/glm/gtx/optimum_pow.hpp rename to 3rdparty/glm/glm/gtx/optimum_pow.hpp diff --git a/glm/glm/gtx/optimum_pow.inl b/3rdparty/glm/glm/gtx/optimum_pow.inl similarity index 100% rename from glm/glm/gtx/optimum_pow.inl rename to 3rdparty/glm/glm/gtx/optimum_pow.inl diff --git a/glm/glm/gtx/orthonormalize.hpp b/3rdparty/glm/glm/gtx/orthonormalize.hpp similarity index 100% rename from glm/glm/gtx/orthonormalize.hpp rename to 3rdparty/glm/glm/gtx/orthonormalize.hpp diff --git a/glm/glm/gtx/orthonormalize.inl b/3rdparty/glm/glm/gtx/orthonormalize.inl similarity index 100% rename from glm/glm/gtx/orthonormalize.inl rename to 3rdparty/glm/glm/gtx/orthonormalize.inl diff --git a/glm/glm/gtx/perpendicular.hpp b/3rdparty/glm/glm/gtx/perpendicular.hpp similarity index 100% rename from glm/glm/gtx/perpendicular.hpp rename to 3rdparty/glm/glm/gtx/perpendicular.hpp diff --git a/glm/glm/gtx/perpendicular.inl b/3rdparty/glm/glm/gtx/perpendicular.inl similarity index 100% rename from glm/glm/gtx/perpendicular.inl rename to 3rdparty/glm/glm/gtx/perpendicular.inl diff --git a/glm/glm/gtx/polar_coordinates.hpp b/3rdparty/glm/glm/gtx/polar_coordinates.hpp similarity index 100% rename from glm/glm/gtx/polar_coordinates.hpp rename to 3rdparty/glm/glm/gtx/polar_coordinates.hpp diff --git a/glm/glm/gtx/polar_coordinates.inl b/3rdparty/glm/glm/gtx/polar_coordinates.inl similarity index 100% rename from glm/glm/gtx/polar_coordinates.inl rename to 3rdparty/glm/glm/gtx/polar_coordinates.inl diff --git a/glm/glm/gtx/projection.hpp b/3rdparty/glm/glm/gtx/projection.hpp similarity index 100% rename from glm/glm/gtx/projection.hpp rename to 3rdparty/glm/glm/gtx/projection.hpp diff --git a/glm/glm/gtx/projection.inl b/3rdparty/glm/glm/gtx/projection.inl similarity index 100% rename from glm/glm/gtx/projection.inl rename to 3rdparty/glm/glm/gtx/projection.inl diff --git a/glm/glm/gtx/quaternion.hpp b/3rdparty/glm/glm/gtx/quaternion.hpp similarity index 100% rename from glm/glm/gtx/quaternion.hpp rename to 3rdparty/glm/glm/gtx/quaternion.hpp diff --git a/glm/glm/gtx/quaternion.inl b/3rdparty/glm/glm/gtx/quaternion.inl similarity index 100% rename from glm/glm/gtx/quaternion.inl rename to 3rdparty/glm/glm/gtx/quaternion.inl diff --git a/glm/glm/gtx/range.hpp b/3rdparty/glm/glm/gtx/range.hpp similarity index 100% rename from glm/glm/gtx/range.hpp rename to 3rdparty/glm/glm/gtx/range.hpp diff --git a/glm/glm/gtx/raw_data.hpp b/3rdparty/glm/glm/gtx/raw_data.hpp similarity index 100% rename from glm/glm/gtx/raw_data.hpp rename to 3rdparty/glm/glm/gtx/raw_data.hpp diff --git a/glm/glm/gtx/raw_data.inl b/3rdparty/glm/glm/gtx/raw_data.inl similarity index 100% rename from glm/glm/gtx/raw_data.inl rename to 3rdparty/glm/glm/gtx/raw_data.inl diff --git a/glm/glm/gtx/rotate_normalized_axis.hpp b/3rdparty/glm/glm/gtx/rotate_normalized_axis.hpp similarity index 100% rename from glm/glm/gtx/rotate_normalized_axis.hpp rename to 3rdparty/glm/glm/gtx/rotate_normalized_axis.hpp diff --git a/glm/glm/gtx/rotate_normalized_axis.inl b/3rdparty/glm/glm/gtx/rotate_normalized_axis.inl similarity index 100% rename from glm/glm/gtx/rotate_normalized_axis.inl rename to 3rdparty/glm/glm/gtx/rotate_normalized_axis.inl diff --git a/glm/glm/gtx/rotate_vector.hpp b/3rdparty/glm/glm/gtx/rotate_vector.hpp similarity index 100% rename from glm/glm/gtx/rotate_vector.hpp rename to 3rdparty/glm/glm/gtx/rotate_vector.hpp diff --git a/glm/glm/gtx/rotate_vector.inl b/3rdparty/glm/glm/gtx/rotate_vector.inl similarity index 100% rename from glm/glm/gtx/rotate_vector.inl rename to 3rdparty/glm/glm/gtx/rotate_vector.inl diff --git a/glm/glm/gtx/scalar_multiplication.hpp b/3rdparty/glm/glm/gtx/scalar_multiplication.hpp similarity index 100% rename from glm/glm/gtx/scalar_multiplication.hpp rename to 3rdparty/glm/glm/gtx/scalar_multiplication.hpp diff --git a/glm/glm/gtx/scalar_relational.hpp b/3rdparty/glm/glm/gtx/scalar_relational.hpp similarity index 100% rename from glm/glm/gtx/scalar_relational.hpp rename to 3rdparty/glm/glm/gtx/scalar_relational.hpp diff --git a/glm/glm/gtx/scalar_relational.inl b/3rdparty/glm/glm/gtx/scalar_relational.inl similarity index 100% rename from glm/glm/gtx/scalar_relational.inl rename to 3rdparty/glm/glm/gtx/scalar_relational.inl diff --git a/glm/glm/gtx/simd_mat4.hpp b/3rdparty/glm/glm/gtx/simd_mat4.hpp similarity index 100% rename from glm/glm/gtx/simd_mat4.hpp rename to 3rdparty/glm/glm/gtx/simd_mat4.hpp diff --git a/glm/glm/gtx/simd_mat4.inl b/3rdparty/glm/glm/gtx/simd_mat4.inl similarity index 100% rename from glm/glm/gtx/simd_mat4.inl rename to 3rdparty/glm/glm/gtx/simd_mat4.inl diff --git a/glm/glm/gtx/simd_quat.hpp b/3rdparty/glm/glm/gtx/simd_quat.hpp similarity index 100% rename from glm/glm/gtx/simd_quat.hpp rename to 3rdparty/glm/glm/gtx/simd_quat.hpp diff --git a/glm/glm/gtx/simd_quat.inl b/3rdparty/glm/glm/gtx/simd_quat.inl similarity index 100% rename from glm/glm/gtx/simd_quat.inl rename to 3rdparty/glm/glm/gtx/simd_quat.inl diff --git a/glm/glm/gtx/simd_vec4.hpp b/3rdparty/glm/glm/gtx/simd_vec4.hpp similarity index 100% rename from glm/glm/gtx/simd_vec4.hpp rename to 3rdparty/glm/glm/gtx/simd_vec4.hpp diff --git a/glm/glm/gtx/simd_vec4.inl b/3rdparty/glm/glm/gtx/simd_vec4.inl similarity index 100% rename from glm/glm/gtx/simd_vec4.inl rename to 3rdparty/glm/glm/gtx/simd_vec4.inl diff --git a/glm/glm/gtx/spline.hpp b/3rdparty/glm/glm/gtx/spline.hpp similarity index 100% rename from glm/glm/gtx/spline.hpp rename to 3rdparty/glm/glm/gtx/spline.hpp diff --git a/glm/glm/gtx/spline.inl b/3rdparty/glm/glm/gtx/spline.inl similarity index 100% rename from glm/glm/gtx/spline.inl rename to 3rdparty/glm/glm/gtx/spline.inl diff --git a/glm/glm/gtx/std_based_type.hpp b/3rdparty/glm/glm/gtx/std_based_type.hpp similarity index 100% rename from glm/glm/gtx/std_based_type.hpp rename to 3rdparty/glm/glm/gtx/std_based_type.hpp diff --git a/glm/glm/gtx/std_based_type.inl b/3rdparty/glm/glm/gtx/std_based_type.inl similarity index 100% rename from glm/glm/gtx/std_based_type.inl rename to 3rdparty/glm/glm/gtx/std_based_type.inl diff --git a/glm/glm/gtx/string_cast.hpp b/3rdparty/glm/glm/gtx/string_cast.hpp similarity index 100% rename from glm/glm/gtx/string_cast.hpp rename to 3rdparty/glm/glm/gtx/string_cast.hpp diff --git a/glm/glm/gtx/string_cast.inl b/3rdparty/glm/glm/gtx/string_cast.inl similarity index 100% rename from glm/glm/gtx/string_cast.inl rename to 3rdparty/glm/glm/gtx/string_cast.inl diff --git a/glm/glm/gtx/transform.hpp b/3rdparty/glm/glm/gtx/transform.hpp similarity index 100% rename from glm/glm/gtx/transform.hpp rename to 3rdparty/glm/glm/gtx/transform.hpp diff --git a/glm/glm/gtx/transform.inl b/3rdparty/glm/glm/gtx/transform.inl similarity index 100% rename from glm/glm/gtx/transform.inl rename to 3rdparty/glm/glm/gtx/transform.inl diff --git a/glm/glm/gtx/transform2.hpp b/3rdparty/glm/glm/gtx/transform2.hpp similarity index 100% rename from glm/glm/gtx/transform2.hpp rename to 3rdparty/glm/glm/gtx/transform2.hpp diff --git a/glm/glm/gtx/transform2.inl b/3rdparty/glm/glm/gtx/transform2.inl similarity index 100% rename from glm/glm/gtx/transform2.inl rename to 3rdparty/glm/glm/gtx/transform2.inl diff --git a/glm/glm/gtx/type_aligned.hpp b/3rdparty/glm/glm/gtx/type_aligned.hpp similarity index 100% rename from glm/glm/gtx/type_aligned.hpp rename to 3rdparty/glm/glm/gtx/type_aligned.hpp diff --git a/glm/glm/gtx/type_aligned.inl b/3rdparty/glm/glm/gtx/type_aligned.inl similarity index 100% rename from glm/glm/gtx/type_aligned.inl rename to 3rdparty/glm/glm/gtx/type_aligned.inl diff --git a/glm/glm/gtx/vector_angle.hpp b/3rdparty/glm/glm/gtx/vector_angle.hpp similarity index 100% rename from glm/glm/gtx/vector_angle.hpp rename to 3rdparty/glm/glm/gtx/vector_angle.hpp diff --git a/glm/glm/gtx/vector_angle.inl b/3rdparty/glm/glm/gtx/vector_angle.inl similarity index 100% rename from glm/glm/gtx/vector_angle.inl rename to 3rdparty/glm/glm/gtx/vector_angle.inl diff --git a/glm/glm/gtx/vector_query.hpp b/3rdparty/glm/glm/gtx/vector_query.hpp similarity index 100% rename from glm/glm/gtx/vector_query.hpp rename to 3rdparty/glm/glm/gtx/vector_query.hpp diff --git a/glm/glm/gtx/vector_query.inl b/3rdparty/glm/glm/gtx/vector_query.inl similarity index 100% rename from glm/glm/gtx/vector_query.inl rename to 3rdparty/glm/glm/gtx/vector_query.inl diff --git a/glm/glm/gtx/wrap.hpp b/3rdparty/glm/glm/gtx/wrap.hpp similarity index 100% rename from glm/glm/gtx/wrap.hpp rename to 3rdparty/glm/glm/gtx/wrap.hpp diff --git a/glm/glm/gtx/wrap.inl b/3rdparty/glm/glm/gtx/wrap.inl similarity index 100% rename from glm/glm/gtx/wrap.inl rename to 3rdparty/glm/glm/gtx/wrap.inl diff --git a/glm/glm/integer.hpp b/3rdparty/glm/glm/integer.hpp similarity index 100% rename from glm/glm/integer.hpp rename to 3rdparty/glm/glm/integer.hpp diff --git a/glm/glm/mat2x2.hpp b/3rdparty/glm/glm/mat2x2.hpp similarity index 100% rename from glm/glm/mat2x2.hpp rename to 3rdparty/glm/glm/mat2x2.hpp diff --git a/glm/glm/mat2x3.hpp b/3rdparty/glm/glm/mat2x3.hpp similarity index 100% rename from glm/glm/mat2x3.hpp rename to 3rdparty/glm/glm/mat2x3.hpp diff --git a/glm/glm/mat2x4.hpp b/3rdparty/glm/glm/mat2x4.hpp similarity index 100% rename from glm/glm/mat2x4.hpp rename to 3rdparty/glm/glm/mat2x4.hpp diff --git a/glm/glm/mat3x2.hpp b/3rdparty/glm/glm/mat3x2.hpp similarity index 100% rename from glm/glm/mat3x2.hpp rename to 3rdparty/glm/glm/mat3x2.hpp diff --git a/glm/glm/mat3x3.hpp b/3rdparty/glm/glm/mat3x3.hpp similarity index 100% rename from glm/glm/mat3x3.hpp rename to 3rdparty/glm/glm/mat3x3.hpp diff --git a/glm/glm/mat3x4.hpp b/3rdparty/glm/glm/mat3x4.hpp similarity index 100% rename from glm/glm/mat3x4.hpp rename to 3rdparty/glm/glm/mat3x4.hpp diff --git a/glm/glm/mat4x2.hpp b/3rdparty/glm/glm/mat4x2.hpp similarity index 100% rename from glm/glm/mat4x2.hpp rename to 3rdparty/glm/glm/mat4x2.hpp diff --git a/glm/glm/mat4x3.hpp b/3rdparty/glm/glm/mat4x3.hpp similarity index 100% rename from glm/glm/mat4x3.hpp rename to 3rdparty/glm/glm/mat4x3.hpp diff --git a/glm/glm/mat4x4.hpp b/3rdparty/glm/glm/mat4x4.hpp similarity index 100% rename from glm/glm/mat4x4.hpp rename to 3rdparty/glm/glm/mat4x4.hpp diff --git a/glm/glm/matrix.hpp b/3rdparty/glm/glm/matrix.hpp similarity index 100% rename from glm/glm/matrix.hpp rename to 3rdparty/glm/glm/matrix.hpp diff --git a/glm/glm/packing.hpp b/3rdparty/glm/glm/packing.hpp similarity index 100% rename from glm/glm/packing.hpp rename to 3rdparty/glm/glm/packing.hpp diff --git a/glm/glm/trigonometric.hpp b/3rdparty/glm/glm/trigonometric.hpp similarity index 100% rename from glm/glm/trigonometric.hpp rename to 3rdparty/glm/glm/trigonometric.hpp diff --git a/glm/glm/vec2.hpp b/3rdparty/glm/glm/vec2.hpp similarity index 100% rename from glm/glm/vec2.hpp rename to 3rdparty/glm/glm/vec2.hpp diff --git a/glm/glm/vec3.hpp b/3rdparty/glm/glm/vec3.hpp similarity index 100% rename from glm/glm/vec3.hpp rename to 3rdparty/glm/glm/vec3.hpp diff --git a/glm/glm/vec4.hpp b/3rdparty/glm/glm/vec4.hpp similarity index 100% rename from glm/glm/vec4.hpp rename to 3rdparty/glm/glm/vec4.hpp diff --git a/glm/glm/vector_relational.hpp b/3rdparty/glm/glm/vector_relational.hpp similarity index 100% rename from glm/glm/vector_relational.hpp rename to 3rdparty/glm/glm/vector_relational.hpp diff --git a/glm/readme.txt b/3rdparty/glm/readme.txt similarity index 100% rename from glm/readme.txt rename to 3rdparty/glm/readme.txt diff --git a/glm/util/CMakeLists.txt b/3rdparty/glm/util/CMakeLists.txt similarity index 100% rename from glm/util/CMakeLists.txt rename to 3rdparty/glm/util/CMakeLists.txt diff --git a/glm/util/FindGLM.cmake b/3rdparty/glm/util/FindGLM.cmake similarity index 100% rename from glm/util/FindGLM.cmake rename to 3rdparty/glm/util/FindGLM.cmake diff --git a/glm/util/autoexp.txt b/3rdparty/glm/util/autoexp.txt similarity index 100% rename from glm/util/autoexp.txt rename to 3rdparty/glm/util/autoexp.txt diff --git a/glm/util/autoexp.vc2010.dat b/3rdparty/glm/util/autoexp.vc2010.dat similarity index 100% rename from glm/util/autoexp.vc2010.dat rename to 3rdparty/glm/util/autoexp.vc2010.dat diff --git a/glm/util/glm.natvis b/3rdparty/glm/util/glm.natvis similarity index 100% rename from glm/util/glm.natvis rename to 3rdparty/glm/util/glm.natvis diff --git a/glm/util/usertype.dat b/3rdparty/glm/util/usertype.dat similarity index 100% rename from glm/util/usertype.dat rename to 3rdparty/glm/util/usertype.dat diff --git a/libpng b/3rdparty/libpng similarity index 100% rename from libpng rename to 3rdparty/libpng diff --git a/CMakeLists.txt b/CMakeLists.txt index 73a9e800a1..4a7eaf462d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ set(PNG_SHARED OFF CACHE BOOL "Build shared lib." FORCE) set(PNG_TESTS OFF CACHE BOOL "Build tests." FORCE) add_subdirectory( asmjit ) -add_subdirectory( libpng ) +add_subdirectory( 3rdparty/libpng ) # TODO: do real installation, including copying directory structure set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${PROJECT_BINARY_DIR}/bin") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${PROJECT_BINARY_DIR}/bin") diff --git a/appveyor.yml b/appveyor.yml index 6b0f7a2f10..c133abf365 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,7 @@ branches: before_build: # until git for win 2.5 release with commit checkout - - git submodule update --init 3rdparty/ffmpeg asmjit 3rdparty/minidx9 rsx_program_decompiler GSL libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers + - git submodule update --init 3rdparty/ffmpeg asmjit 3rdparty/minidx9 rsx_program_decompiler 3rdparty/GSL 3rdparty/libpng Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers - 7z x wxWidgets.7z -aos -oC:\rpcs3\wxWidgets > null - 7z x zlib.7z -aos -oC:\rpcs3\ > null - if %configuration%==Release (cmake -G "Visual Studio 14 Win64" -DZLIB_ROOT=C:/rpcs3/zlib/) diff --git a/rpcs3-tests/rpcs3-tests.vcxproj b/rpcs3-tests/rpcs3-tests.vcxproj index 0d2984b164..8adb984884 100644 --- a/rpcs3-tests/rpcs3-tests.vcxproj +++ b/rpcs3-tests/rpcs3-tests.vcxproj @@ -55,7 +55,7 @@ true - $(VCInstallDir)UnitTest\lib;..\OpenAL\libs\Win64;..\ffmpeg\Windows\x86_64\lib;%(AdditionalLibraryDirectories) + $(VCInstallDir)UnitTest\lib;..\3rdparty\OpenAL\libs\Win64;..\3rdparty\ffmpeg\Windows\x86_64\lib;%(AdditionalLibraryDirectories) diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 38ed04ef08..455349faad 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -112,9 +112,9 @@ ${LLVM_INCLUDE_DIRS} "${RPCS3_SRC_DIR}/Crypto" "${RPCS3_SRC_DIR}/.." "${RPCS3_SRC_DIR}/../asmjit/src/asmjit" -"${RPCS3_SRC_DIR}/../glm" -"${RPCS3_SRC_DIR}/../libpng" -"${RPCS3_SRC_DIR}/../GSL/include" +"${RPCS3_SRC_DIR}/../3rdparty/glm" +"${RPCS3_SRC_DIR}/../3rdparty/libpng" +"${RPCS3_SRC_DIR}/../3rdparty/GSL/include" "${RPCS3_SRC_DIR}/../rsx_program_decompiler/rsx_decompiler" "${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code" "${RPCS3_SRC_DIR}/../Vulkan/Vulkan-LoaderAndValidationLayers/include" diff --git a/rpcs3/XAudio.vcxproj b/rpcs3/XAudio.vcxproj index 93488ac8c0..5ecbcc26d9 100644 --- a/rpcs3/XAudio.vcxproj +++ b/rpcs3/XAudio.vcxproj @@ -63,7 +63,7 @@ - ..\minidx9\Include;%(AdditionalIncludeDirectories) + ..\3rdparty\minidx9\Include;%(AdditionalIncludeDirectories) diff --git a/rpcs3_default.props b/rpcs3_default.props index 41747ecc4d..b739149eb8 100644 --- a/rpcs3_default.props +++ b/rpcs3_default.props @@ -3,15 +3,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - .\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;..\wxWidgets\src\zlib;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\minidx12\Include;..\glm;..\GSL\include;..\libpng -======= - .\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;..\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\minidx12\Include;..\glm;..\GSL\include;..\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include ->>>>>>> 07c1ee3... Moves GL, minidx12, OpenAL, stblib to 3rdparty -======= - .\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;..\3rdparty\ffmpeg\WindowsInclude;..\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\minidx12\Include;..\glm;..\GSL\include;..\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include ->>>>>>> 0283af3... Moves ffmpeg and minidx9 to 3rdparty + .\;..\;..\asmjit\src\asmjit;..\wxWidgets\include\msvc;..\wxWidgets\include;..\wxWidgets\src\zlib;..\3rdparty\ffmpeg\WindowsInclude;..\3rdparty\ffmpeg\Windows\x86_64\Include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(UniversalCRT_IncludePath);..\3rdparty\minidx12\Include;..\3rdparty\glm;..\3rdparty\GSL\include;..\3rdparty\libpng;..\3rdparty\GL;..\3rdparty\stblib;..\3rdparty\OpenAL\include $(SolutionDir)lib\$(Configuration)-$(Platform)\ $(SolutionDir)lib\$(Configuration)-$(Platform)\;$(UniversalCRT_LibraryPath_x64);$(LibraryPath) $(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)\ @@ -35,7 +27,7 @@ true odbc32.lib;odbccp32.lib;comctl32.lib;ws2_32.lib;shlwapi.lib;winmm.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;rpcrt4.lib;libpng.lib;%(AdditionalDependencies) true - ..\wxWidgets\lib\vc_x64_lib;..\ffmpeg\Windows\x86_64\lib;..\lib\ + ..\wxWidgets\lib\vc_x64_lib;..\3rdparty\ffmpeg\Windows\x86_64\lib;..\lib\ 0x10000 false