From 4e871901dc69dba302b1e3489aba041b98feb310 Mon Sep 17 00:00:00 2001
From: Edgar <Edgar@AnotherFoxGuy.com>
Date: Fri, 10 Sep 2021 12:32:57 +0000
Subject: [PATCH] :bug: Fixed OGRE 1.12.13 build on Windows

---
 build.py               | 4 +---
 ogre/1.12/conanfile.py | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 build.py

diff --git a/build.py b/build.py
old mode 100644
new mode 100755
index 620f022..73c8a5c
--- a/build.py
+++ b/build.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python3
 import os
-import sys
-import platform
 from glob import glob
 import yaml
 import subprocess
@@ -40,4 +38,4 @@ data = list(filter(lambda k: 'anotherfoxguy' in k, subprocess.run(
     ['conan', 'search', '*', '--raw'], stdout=subprocess.PIPE).stdout.decode("utf-8").split()))
 
 for d in data:
-    system(f"conan upload {d} -r ror-v2 --all --force")
+    system(f"conan upload {d} -r ror-v2 --all")
diff --git a/ogre/1.12/conanfile.py b/ogre/1.12/conanfile.py
index c8112bc..80ef8ee 100644
--- a/ogre/1.12/conanfile.py
+++ b/ogre/1.12/conanfile.py
@@ -36,6 +36,8 @@ 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_CSHARP"] = "OFF"
         cmake.definitions["OGRE_BUILD_COMPONENT_JAVA"] = "OFF"
@@ -46,9 +48,9 @@ class OGREConan(ConanFile):
         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"] = self.options.resourcemanager_strict
         cmake.definitions["OGRE_INSTALL_SAMPLES"] = "OFF"
         cmake.definitions["OGRE_BUILD_PLUGIN_DOT_SCENE"] = "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"
         cmake.configure()