diff --git a/ogre/all/conandata.yml b/ogre/1.11/conandata.yml similarity index 70% rename from ogre/all/conandata.yml rename to ogre/1.11/conandata.yml index 72ce2c9..e93eb52 100644 --- a/ogre/all/conandata.yml +++ b/ogre/1.11/conandata.yml @@ -1,11 +1,12 @@ sources: "1.11.6.1": - url: "https://github.com/only-a-ptr/ogre/archive/0ee9c1761cb90e8864ae9b93d9901affa5522444.zip" + url: "https://github.com/AnotherFoxGuy/ogre/archive/refs/tags/1.11.6.1.tar.gz" sha256: "e58f2fc55bad64f75a43b309ccfaccdb0b9889fbed20547e51f10d7d4824ab9f" patches: "1.11.6.1": - patch_file: "patches/1.11.6.1/CMakeLists.txt.patch" - patch_file: "patches/1.11.6.1/Dependencies.cmake.patch" + - patch_file: "patches/1.11.6.1/Samples-CMakeList.txt.patch" requirements: - "zlib/[1.x]" - "zziplib/[0.13.x]" diff --git a/ogre/all/conanfile.py b/ogre/1.11/conanfile.py similarity index 97% rename from ogre/all/conanfile.py rename to ogre/1.11/conanfile.py index 19a1271..0fae077 100644 --- a/ogre/all/conanfile.py +++ b/ogre/1.11/conanfile.py @@ -1,71 +1,71 @@ -from conans import ConanFile, CMake, tools -from conans.tools import os_info, SystemPackageTool - - -class OGREConan(ConanFile): - name = "ogre3d" - license = "MIT" - url = "https://github.com/AnotherFoxGuy/conan-OGRE" - description = "scene-oriented, flexible 3D engine written in C++" - settings = "os", "compiler", "build_type", "arch" - generators = "cmake_paths" - exports_sources = "patches/**" - - def requirements(self): - for req in self.conan_data["requirements"]: - self.requires(req) - - def system_requirements(self): - if os_info.is_linux: - if os_info.with_apt: - installer = SystemPackageTool() - installer.install("libx11-dev") - installer.install("libxaw7-dev") - - def source(self): - tools.get(**self.conan_data["sources"][self.version], strip_root=True) - for patch in self.conan_data["patches"][self.version]: - tools.patch(**patch) - - def build(self): - cmake = CMake(self) - cmake.definitions["OGRE_BUILD_DEPENDENCIES"] = "OFF" - cmake.definitions["OGRE_BUILD_COMPONENT_OVERLAY_IMGUI"] = "ON" - cmake.definitions["OGRE_BUILD_COMPONENT_CSHARP"] = "OFF" - cmake.definitions["OGRE_BUILD_COMPONENT_JAVA"] = "OFF" - cmake.definitions["OGRE_BUILD_COMPONENT_PYTHON"] = "OFF" - cmake.definitions["OGRE_BUILD_PLUGIN_STBI"] = "OFF" - cmake.definitions["OGRE_BUILD_COMPONENT_BITES"] = "ON" - cmake.definitions["OGRE_BUILD_SAMPLES"] = "OFF" - cmake.definitions["OGRE_BUILD_RENDERSYSTEM_D3D9"] = "ON" - cmake.definitions["OGRE_BUILD_RENDERSYSTEM_D3D11"] = "ON" - cmake.definitions["OGRE_BUILD_RENDERSYSTEM_GL3PLUS"] = "OFF" - cmake.definitions["OGRE_RESOURCEMANAGER_STRICT"] = 0 - cmake.definitions["OGRE_INSTALL_SAMPLES"] = "OFF" - if os_info.is_windows: - cmake.definitions["CMAKE_CXX_FLAGS"] = "-D_OGRE_FILESYSTEM_ARCHIVE_UNICODE" - cmake.configure() - cmake.build() - - def package(self): - cmake = CMake(self) - cmake.install() - - def package_info(self): - self.cpp_info.includedirs = [ - "include", - "include/OGRE", - "include/OGRE/Bites", - "include/OGRE/HLMS", - "include/OGRE/MeshLodGenerator", - "include/OGRE/Overlay", - "include/OGRE/Paging", - "include/OGRE/Plugins", - "include/OGRE/Property", - "include/OGRE/RenderSystems", - "include/OGRE/RTShaderSystem", - "include/OGRE/Terrain", - "include/OGRE/Threading", - "include/OGRE/Volume", - ] - self.cpp_info.libs = tools.collect_libs(self) +from conans import ConanFile, CMake, tools +from conans.tools import os_info, SystemPackageTool + + +class OGREConan(ConanFile): + name = "ogre3d" + license = "MIT" + url = "https://github.com/AnotherFoxGuy/conan-OGRE" + description = "scene-oriented, flexible 3D engine written in C++" + settings = "os", "compiler", "build_type", "arch" + generators = "cmake_paths" + exports_sources = "patches/**" + + def requirements(self): + for req in self.conan_data["requirements"]: + self.requires(req) + + def system_requirements(self): + if os_info.is_linux: + if os_info.with_apt: + installer = SystemPackageTool() + installer.install("libx11-dev") + installer.install("libxaw7-dev") + + def source(self): + tools.get(**self.conan_data["sources"][self.version], strip_root=True) + for patch in self.conan_data["patches"][self.version]: + tools.patch(**patch) + + def build(self): + cmake = CMake(self) + cmake.definitions["OGRE_BUILD_DEPENDENCIES"] = "OFF" + cmake.definitions["OGRE_BUILD_COMPONENT_OVERLAY_IMGUI"] = "ON" + cmake.definitions["OGRE_BUILD_COMPONENT_CSHARP"] = "OFF" + cmake.definitions["OGRE_BUILD_COMPONENT_JAVA"] = "OFF" + cmake.definitions["OGRE_BUILD_COMPONENT_PYTHON"] = "OFF" + cmake.definitions["OGRE_BUILD_PLUGIN_STBI"] = "OFF" + cmake.definitions["OGRE_BUILD_COMPONENT_BITES"] = "ON" + cmake.definitions["OGRE_BUILD_SAMPLES"] = "OFF" + cmake.definitions["OGRE_BUILD_RENDERSYSTEM_D3D9"] = "ON" + cmake.definitions["OGRE_BUILD_RENDERSYSTEM_D3D11"] = "ON" + cmake.definitions["OGRE_BUILD_RENDERSYSTEM_GL3PLUS"] = "OFF" + cmake.definitions["OGRE_RESOURCEMANAGER_STRICT"] = 0 + cmake.definitions["OGRE_INSTALL_SAMPLES"] = "OFF" + if os_info.is_windows: + cmake.definitions["CMAKE_CXX_FLAGS"] = "-D_OGRE_FILESYSTEM_ARCHIVE_UNICODE" + cmake.configure() + cmake.build() + + def package(self): + cmake = CMake(self) + cmake.install() + + def package_info(self): + self.cpp_info.includedirs = [ + "include", + "include/OGRE", + "include/OGRE/Bites", + "include/OGRE/HLMS", + "include/OGRE/MeshLodGenerator", + "include/OGRE/Overlay", + "include/OGRE/Paging", + "include/OGRE/Plugins", + "include/OGRE/Property", + "include/OGRE/RenderSystems", + "include/OGRE/RTShaderSystem", + "include/OGRE/Terrain", + "include/OGRE/Threading", + "include/OGRE/Volume", + ] + self.cpp_info.libs = tools.collect_libs(self) diff --git a/ogre/all/patches/1.11.6.1/CMakeLists.txt.patch b/ogre/1.11/patches/1.11.6.1/CMakeLists.txt.patch similarity index 100% rename from ogre/all/patches/1.11.6.1/CMakeLists.txt.patch rename to ogre/1.11/patches/1.11.6.1/CMakeLists.txt.patch diff --git a/ogre/all/patches/1.11.6.1/Dependencies.cmake.patch b/ogre/1.11/patches/1.11.6.1/Dependencies.cmake.patch similarity index 100% rename from ogre/all/patches/1.11.6.1/Dependencies.cmake.patch rename to ogre/1.11/patches/1.11.6.1/Dependencies.cmake.patch diff --git a/ogre/1.11/patches/1.11.6.1/Samples-CMakeList.txt.patch b/ogre/1.11/patches/1.11.6.1/Samples-CMakeList.txt.patch new file mode 100644 index 0000000..28ad3be --- /dev/null +++ b/ogre/1.11/patches/1.11.6.1/Samples-CMakeList.txt.patch @@ -0,0 +1,11 @@ +--- Samples/CMakeLists.txt ++++ Samples/CMakeLists.txt +@@ -108,7 +108,7 @@ + install(FILES ${SAMPLE_COMMON_HEADERS} + DESTINATION include/OGRE) + +-if (MSVC) ++if (_NOT_USED) + find_package(Wix) + if (Wix_FOUND) + # Create WiX setup for demo build diff --git a/ogre/config.yml b/ogre/config.yml index 7118e6f..0efc922 100644 --- a/ogre/config.yml +++ b/ogre/config.yml @@ -1,3 +1,3 @@ versions: - "1.11.6.1: - folder: all + "1.11.6.1": + folder: "1.11" \ No newline at end of file