From 0d0aea2a720da7aa360a1fd57f6aff063f8bbb3a Mon Sep 17 00:00:00 2001 From: Edgar Date: Tue, 11 Jun 2024 10:57:13 +0200 Subject: [PATCH] :arrow_up: Updated cgltf to 1.14 --- conan-recipes/cgltf/all/conandata.yml | 3 +++ conan-recipes/cgltf/config.yml | 16 ---------------- conan-recipes/cgltf/repoinfo.yml | 2 ++ conanfile.py | 7 ++++++- 4 files changed, 11 insertions(+), 17 deletions(-) create mode 100644 conan-recipes/cgltf/repoinfo.yml diff --git a/conan-recipes/cgltf/all/conandata.yml b/conan-recipes/cgltf/all/conandata.yml index ce570d96f3..94c7ecfa47 100644 --- a/conan-recipes/cgltf/all/conandata.yml +++ b/conan-recipes/cgltf/all/conandata.yml @@ -2,6 +2,9 @@ sources: "2024.02": url: "https://github.com/jkuhlmann/cgltf/archive/de399881c65c438a635627c749440eeea7e05599.tar.gz" sha256: "82f66737421cbd2a0797d7eb1dda61707317c44091dd514bf4a55401ba03fc8f" + "1.14": + url: "https://github.com/jkuhlmann/cgltf/archive/v1.14.tar.gz" + sha256: "2f3c97a6b989943f50e7d7f228688f6558fe37b1411c13a350e3560d061707d8" "1.13": url: "https://github.com/jkuhlmann/cgltf/archive/v1.13.tar.gz" sha256: "053d5320097334767486c6e33d01dd1b1c6224eac82aac2d720f4ec456d8c50b" diff --git a/conan-recipes/cgltf/config.yml b/conan-recipes/cgltf/config.yml index 9f334f27c8..48dc233bad 100644 --- a/conan-recipes/cgltf/config.yml +++ b/conan-recipes/cgltf/config.yml @@ -1,19 +1,3 @@ versions: "1.13": folder: all - "1.12": - folder: all - "1.11": - folder: all - "1.10": - folder: all - "1.9": - folder: all - "1.8": - folder: all - "1.7": - folder: all - "1.6": - folder: all - "1.5": - folder: all diff --git a/conan-recipes/cgltf/repoinfo.yml b/conan-recipes/cgltf/repoinfo.yml new file mode 100644 index 0000000000..870ca9965e --- /dev/null +++ b/conan-recipes/cgltf/repoinfo.yml @@ -0,0 +1,2 @@ +- repo: jkuhlmann/cgltf + folder: all \ No newline at end of file diff --git a/conanfile.py b/conanfile.py index 462cbf6346..8be69c6248 100644 --- a/conanfile.py +++ b/conanfile.py @@ -46,7 +46,7 @@ class Overte(ConanFile): # self.requires("shaderc/2021.1") # Broken # self.requires("crashpad/cci.20220219") # Broken self.requires("bullet3/3.25") - self.requires("cgltf/2024.02@overte/stable") + self.requires("cgltf/1.14@overte/stable") self.requires("discord-rpc/3.4.0@anotherfoxguy/stable") self.requires("draco/1.3.5") self.requires("etc2comp/cci.20170424") @@ -131,3 +131,8 @@ class Overte(ConanFile): ) copy(self, "*.dll", src, bindir, False) copy(self, "*.so*", src, bindir, False) + if self.settings.os == "Windows" and self.settings.build_type == "Release": + bindir = os.path.join( + self.build_folder, "conanlibs", "RelWithDebInfo" + ) + copy(self, "*.dll", src, bindir, False)