diff --git a/ogre/13/conandata.yml b/ogre/13/conandata.yml index da4eb22..43af906 100644 --- a/ogre/13/conandata.yml +++ b/ogre/13/conandata.yml @@ -5,6 +5,9 @@ sources: "13.3.1": url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.3.1.tar.gz" sha256: "8b874952a8f6161b3307c29df00f21a0d5710de5e85bf41383b405717da07bb4" + "13.3.2": + url: "https://github.com/OGRECave/ogre/archive/refs/tags/v13.3.2.tar.gz" + sha256: "de8eed6919e0cd0d734a7c9b9b6af01faadf81aefd06d1472a14e4c2c7056951" patches: "13.2.4": - patch_file: "patches/13.2.4/CMakeLists.txt.patch" @@ -14,6 +17,10 @@ patches: - patch_file: "patches/13.3.1/CMakeLists.txt.patch" - patch_file: "patches/13.3.1/pugixml-fix.patch" - patch_file: "patches/13.3.1/FindPkgMacros.cmake.patch" + "13.3.2": + - patch_file: "patches/13.3.1/CMakeLists.txt.patch" + - patch_file: "patches/13.3.1/pugixml-fix.patch" + - patch_file: "patches/13.3.1/FindPkgMacros.cmake.patch" requirements: - "zlib/[1.x]" - "zziplib/[0.13.x]" diff --git a/ogre/13/conanfile.py b/ogre/13/conanfile.py index af061ee..adc2ec3 100644 --- a/ogre/13/conanfile.py +++ b/ogre/13/conanfile.py @@ -64,6 +64,9 @@ class OGREConan(ConanFile): for req in self.conan_data["requirements"]: self.requires(req) + if os_info.is_windows: + self.requires("directx-sdk/9.0@anotherfoxguy/stable") + def system_requirements(self): if os_info.is_linux: if os_info.with_apt: @@ -77,6 +80,11 @@ class OGREConan(ConanFile): def source(self): tools.get(**self.conan_data["sources"][self.version], strip_root=True) + tools.replace_in_file( + "CMake/Dependencies.cmake", + "find_package(DirectX)", + "find_package(DirectX9)", + ) for patch in self.conan_data["patches"][self.version]: tools.patch(**patch) diff --git a/ogre/config.yml b/ogre/config.yml index b0879e5..911cc57 100644 --- a/ogre/config.yml +++ b/ogre/config.yml @@ -1,7 +1,5 @@ versions: "1.11.6.1": folder: "1.11" - "1.12.13": - folder: "1.12" - "13.3.1": + "13.3.2": folder: "13" \ No newline at end of file