From e5a748ea1194d00cf2ec1c939015c97c7109d08c Mon Sep 17 00:00:00 2001 From: Edgar Date: Sat, 29 Jan 2022 10:12:37 +0000 Subject: [PATCH] :wrench: Enable STBI plugin for ogre --- ogre/1.11/conanfile.py | 12 ++++++------ ogre/1.12/conanfile.py | 22 +++++++++++----------- ogre/13/conanfile.py | 24 ++++++++++++------------ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ogre/1.11/conanfile.py b/ogre/1.11/conanfile.py index 1865ef5..89c19bb 100644 --- a/ogre/1.11/conanfile.py +++ b/ogre/1.11/conanfile.py @@ -33,19 +33,19 @@ class OGREConan(ConanFile): 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_BITES"] = "ON" cmake.definitions["OGRE_BUILD_COMPONENT_CSHARP"] = "OFF" cmake.definitions["OGRE_BUILD_COMPONENT_JAVA"] = "OFF" + cmake.definitions["OGRE_BUILD_COMPONENT_OVERLAY_IMGUI"] = "ON" cmake.definitions["OGRE_BUILD_COMPONENT_PYTHON"] = "OFF" + cmake.definitions["OGRE_BUILD_DEPENDENCIES"] = "OFF" cmake.definitions["OGRE_BUILD_PLUGIN_STBI"] = "ON" - 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_D3D9"] = "ON" cmake.definitions["OGRE_BUILD_RENDERSYSTEM_GL3PLUS"] = "OFF" - cmake.definitions["OGRE_RESOURCEMANAGER_STRICT"] = 0 + cmake.definitions["OGRE_BUILD_SAMPLES"] = "OFF" cmake.definitions["OGRE_INSTALL_SAMPLES"] = "OFF" + cmake.definitions["OGRE_RESOURCEMANAGER_STRICT"] = 0 if os_info.is_windows: cmake.definitions["CMAKE_CXX_FLAGS"] = "-D_OGRE_FILESYSTEM_ARCHIVE_UNICODE" cmake.configure() diff --git a/ogre/1.12/conanfile.py b/ogre/1.12/conanfile.py index 80ef8ee..c5befba 100644 --- a/ogre/1.12/conanfile.py +++ b/ogre/1.12/conanfile.py @@ -35,21 +35,21 @@ class OGREConan(ConanFile): def build(self): cmake = CMake(self) - cmake.definitions["OGRE_BUILD_DEPENDENCIES"] = "OFF" - cmake.definitions["OGRE_COPY_DEPENDENCIES"] = "OFF" - cmake.definitions["OGRE_INSTALL_DEPENDENCIES"] = "OFF" - cmake.definitions["OGRE_BUILD_COMPONENT_OVERLAY_IMGUI"] = "ON" + cmake.definitions["OGRE_BUILD_COMPONENT_BITES"] = "ON" cmake.definitions["OGRE_BUILD_COMPONENT_CSHARP"] = "OFF" cmake.definitions["OGRE_BUILD_COMPONENT_JAVA"] = "OFF" + cmake.definitions["OGRE_BUILD_COMPONENT_OVERLAY_IMGUI"] = "ON" cmake.definitions["OGRE_BUILD_COMPONENT_PYTHON"] = "OFF" - cmake.definitions["OGRE_BUILD_PLUGIN_STBI"] = "ON" - 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_INSTALL_SAMPLES"] = "OFF" + cmake.definitions["OGRE_BUILD_DEPENDENCIES"] = "OFF" cmake.definitions["OGRE_BUILD_PLUGIN_DOT_SCENE"] = "OFF" + cmake.definitions["OGRE_BUILD_PLUGIN_STBI"] = "ON" + cmake.definitions["OGRE_BUILD_RENDERSYSTEM_D3D11"] = "ON" + cmake.definitions["OGRE_BUILD_RENDERSYSTEM_D3D9"] = "ON" + cmake.definitions["OGRE_BUILD_RENDERSYSTEM_GL3PLUS"] = "OFF" + cmake.definitions["OGRE_BUILD_SAMPLES"] = "OFF" + cmake.definitions["OGRE_COPY_DEPENDENCIES"] = "OFF" + cmake.definitions["OGRE_INSTALL_DEPENDENCIES"] = "OFF" + cmake.definitions["OGRE_INSTALL_SAMPLES"] = "OFF" cmake.definitions["OGRE_RESOURCEMANAGER_STRICT"] = self.options.resourcemanager_strict if os_info.is_windows: cmake.definitions["CMAKE_CXX_FLAGS"] = "-D_OGRE_FILESYSTEM_ARCHIVE_UNICODE" diff --git a/ogre/13/conanfile.py b/ogre/13/conanfile.py index 5f49cac..dc1d2fb 100644 --- a/ogre/13/conanfile.py +++ b/ogre/13/conanfile.py @@ -33,22 +33,22 @@ class OGREConan(ConanFile): def build(self): cmake = CMake(self) - cmake.definitions["OGRE_BUILD_DEPENDENCIES"] = "OFF" - cmake.definitions["OGRE_COPY_DEPENDENCIES"] = "OFF" - cmake.definitions["OGRE_INSTALL_DEPENDENCIES"] = "OFF" - cmake.definitions["OGRE_BUILD_COMPONENT_OVERLAY_IMGUI"] = "ON" + cmake.definitions["OGRE_BUILD_COMPONENT_BITES"] = "ON" cmake.definitions["OGRE_BUILD_COMPONENT_CSHARP"] = "OFF" cmake.definitions["OGRE_BUILD_COMPONENT_JAVA"] = "OFF" + cmake.definitions["OGRE_BUILD_COMPONENT_OVERLAY_IMGUI"] = "ON" 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" + cmake.definitions["OGRE_BUILD_DEPENDENCIES"] = "OFF" cmake.definitions["OGRE_BUILD_PLUGIN_DOT_SCENE"] = "OFF" + cmake.definitions["OGRE_BUILD_PLUGIN_STBI"] = "ON" + cmake.definitions["OGRE_BUILD_RENDERSYSTEM_D3D11"] = "ON" + cmake.definitions["OGRE_BUILD_RENDERSYSTEM_D3D9"] = "ON" + cmake.definitions["OGRE_BUILD_RENDERSYSTEM_GL3PLUS"] = "OFF" + cmake.definitions["OGRE_BUILD_SAMPLES"] = "OFF" + cmake.definitions["OGRE_COPY_DEPENDENCIES"] = "OFF" + cmake.definitions["OGRE_INSTALL_DEPENDENCIES"] = "OFF" + cmake.definitions["OGRE_INSTALL_SAMPLES"] = "OFF" + cmake.definitions["OGRE_RESOURCEMANAGER_STRICT"] = 0 if os_info.is_windows: cmake.definitions["CMAKE_CXX_FLAGS"] = "-D_OGRE_FILESYSTEM_ARCHIVE_UNICODE" cmake.configure()