Merge branch 'OGRECave:master' into RenderingThread

OGRECave · Oct 25, 2024 · 2a4993e · 2a4993e
2 parents 206572a + da1ff43
commit 2a4993e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/CMake/OgreFeatureSummary.cmake b/CMake/OgreFeatureSummary.cmake
@@ -72,7 +72,7 @@ if (OGRE_BUILD_PLUGIN_BSP)
 	set(_plugins "${_plugins}  + BSP scene manager\n")
 endif ()
 if (OGRE_BUILD_PLUGIN_CG)
-	set(_plugins "${_plugins}  + Cg program manager\n")
+	set(_plugins "${_plugins}  + Cg program manager [DEPRECATED]\n")
 endif ()
 if (OGRE_BUILD_PLUGIN_GLSLANG)
 	set(_plugins "${_plugins}  + Glslang (SPIRV) program manager\n")
@@ -81,13 +81,13 @@ if (OGRE_BUILD_PLUGIN_OCTREE)
 	set(_plugins "${_plugins}  + Octree scene manager\n")
 endif ()
 if(OGRE_BUILD_PLUGIN_EXRCODEC)
-	set(_plugins "${_plugins}  + OpenEXR image codec\n")
+	set(_plugins "${_plugins}  + OpenEXR image codec [DEPRECATED]\n")
 endif()
 if (OGRE_BUILD_PLUGIN_STBI)
 	set(_plugins "${_plugins}  + STBI codec (generic)\n")
 endif ()
 if (OGRE_BUILD_PLUGIN_FREEIMAGE)
-	set(_plugins "${_plugins}  + FreeImage codec (generic)\n")
+	set(_plugins "${_plugins}  + FreeImage codec (generic) [DEPRECATED]\n")
 endif ()
 if (OGRE_BUILD_PLUGIN_PCZ)
 	set(_plugins "${_plugins}  + Portal connected zone scene manager\n")

diff --git a/Components/Overlay/src/OgreOverlayTranslator.cpp b/Components/Overlay/src/OgreOverlayTranslator.cpp
@@ -132,7 +132,7 @@ void FontTranslator::parseAttribute(ScriptCompiler* compiler, FontPtr& pFont,
     else if (prop->values.empty() || !getString(prop->values.front(), &val) ||
              !pFont->setParameter(attrib, val))
     {
-        compiler->addError(ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line);
+        compiler->addError(ScriptCompiler::CE_INVALIDPARAMETERS, prop->file, prop->line, attrib);
     }
 }
 

diff --git a/OgreMain/include/OgrePrerequisites.h b/OgreMain/include/OgrePrerequisites.h
@@ -32,6 +32,17 @@ THE SOFTWARE
 #include <string>
 #include <memory>
 
+// extra namespace to trigger LNK2019 on binary incompatible builds
+// instead of crashing at runtime
+#if defined(_MSC_VER) && defined(_DEBUG)
+#define OGRE_DEBUG_NS_BEGIN namespace DEBUG_BUILD_REQUIRED {
+#define OGRE_DEBUG_NS_END }
+namespace Ogre { namespace DEBUG_BUILD_REQUIRED { } using namespace DEBUG_BUILD_REQUIRED; }
+#else
+#define OGRE_DEBUG_NS_BEGIN
+#define OGRE_DEBUG_NS_END
+#endif
+
 namespace Ogre {
     #define OGRE_TOKEN_PASTE_INNER(x, y) x ## y
     #define OGRE_TOKEN_PASTE(x, y) OGRE_TOKEN_PASTE_INNER(x, y)
@@ -211,7 +222,9 @@ namespace Ogre {
     class ResourceGroupManager;
     class ResourceManager;
     class RibbonTrail;
+OGRE_DEBUG_NS_BEGIN
     class Root;
+OGRE_DEBUG_NS_END
     class SceneManager;
     class SceneNode;
     class SceneQuery;

diff --git a/OgreMain/include/OgreRoot.h b/OgreMain/include/OgreRoot.h
@@ -55,6 +55,8 @@ namespace Ogre
     /// Scene manager instances, indexed by instance name
     typedef std::map<String, SceneManager*> SceneManagerInstanceMap;
 
+    OGRE_DEBUG_NS_BEGIN
+
     /** The root class of the Ogre system.
 
         The Ogre::Root class represents a starting point for the client
@@ -925,6 +927,7 @@ namespace Ogre
         */
         Real getDefaultMinPixelSize() { return mDefaultMinPixelSize; }
     };
+    OGRE_DEBUG_NS_END
     /** @} */
     /** @} */
 } // Namespace Ogre

diff --git a/SDK/Dockerfile b/SDK/Dockerfile
@@ -1,7 +1,7 @@
 FROM quay.io/pypa/manylinux_2_28_x86_64:latest
 RUN yum install -y libXrandr-devel mesa-libEGL-devel vulkan-devel
 WORKDIR /
-RUN curl -LO https://sdk.lunarg.com/sdk/download/1.3.275.0/linux/vulkansdk-linux-x86_64-1.3.275.0.tar.gz && tar xvf vulkansdk-linux-x86_64-1.3.275.0.tar.gz
+RUN curl -LO https://sdk.lunarg.com/sdk/download/1.3.275.0/linux/vulkansdk-linux-x86_64-1.3.275.0.tar.xz && tar xvf vulkansdk-linux-x86_64-1.3.275.0.tar.xz
 ENV VULKAN_SDK=/1.3.275.0/x86_64/
 WORKDIR /workspace
 CMD PATH="/opt/python/$PYVER/bin/:$PATH" pip wheel . --verbose