From 17899a42a5e72f96bd8a7c42f211c27469a62c2b Mon Sep 17 00:00:00 2001 From: Edgar Date: Fri, 28 Oct 2022 11:32:36 +0200 Subject: [PATCH] :wrench: Added support for building directx-sdk with conan v2 --- directx-sdk/all/conanfile.py | 20 ++++++++++---------- directx-sdk/config.yml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/directx-sdk/all/conanfile.py b/directx-sdk/all/conanfile.py index 95f9763..5e0ec50 100644 --- a/directx-sdk/all/conanfile.py +++ b/directx-sdk/all/conanfile.py @@ -1,23 +1,23 @@ -from conans import ConanFile, tools -from conans.tools import os_info +from conan import ConanFile +from conan.tools.files import get, copy +import os - -class GcConan(ConanFile): +class DxConan(ConanFile): name = "directx-sdk" version = "9.0" author = "Edgar Edgar@AnotherFoxGuy.com" settings = "os", "arch" def source(self): - tools.get(**self.conan_data["sources"][self.version]) + get(self, **self.conan_data["sources"][self.version]) def package(self): - self.copy("*", src="Include", dst="include") - if self.settings.arch.__contains__("64"): - self.copy("*", src="Lib/x64", dst="lib", keep_path=False) + copy(self, "*", os.path.join(self.source_folder, "Include"), os.path.join(self.package_folder, "include")) + if '64' in self.settings.arch: + copy(self, "*", os.path.join(self.source_folder, "Lib/x64"), os.path.join(self.package_folder, "lib"), keep_path=False) else: - self.copy("*", src="lib/x86", dst="lib", keep_path=False) + copy(self, "*", os.path.join(self.source_folder, "lib/x86"), os.path.join(self.package_folder, "lib"), keep_path=False) def package_info(self): - self.cpp_info.name = "DirectX9" + self.cpp_info.set_property("cmake_file_name", "DirectX9") self.cpp_info.libs = ["d3d9", "d3dx9", "dxguid"] diff --git a/directx-sdk/config.yml b/directx-sdk/config.yml index 992d10e..a13d7a9 100644 --- a/directx-sdk/config.yml +++ b/directx-sdk/config.yml @@ -1,3 +1,3 @@ versions: - "3.1": + "9.0": folder: all