do not compare OGRE_DEBUG_MODE with 1, it can be 0..3

OGRECave · Sep 20, 2024 · f72b0ca · f72b0ca
1 parent e45cc81
commit f72b0ca
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/OgreMain/include/OgreFileSystemLayer.h b/OgreMain/include/OgreFileSystemLayer.h
@@ -73,7 +73,7 @@ namespace Ogre
          */
         const Ogre::String getConfigFilePath( Ogre::String filename ) const
         {
-#if OGRE_DEBUG_MODE == 1 && \
+#if OGRE_DEBUG_MODE && \
     ( OGRE_PLATFORM != OGRE_PLATFORM_APPLE && OGRE_PLATFORM != OGRE_PLATFORM_APPLE_IOS )
             // add OGRE_BUILD_SUFFIX (default: "_d") to config file names
             Ogre::String::size_type pos = filename.rfind( '.' );

diff --git a/OgreMain/src/WIN32/OgreConfigDialog.cpp b/OgreMain/src/WIN32/OgreConfigDialog.cpp
@@ -47,7 +47,7 @@ namespace Ogre
 #    ifdef OGRE_STATIC_LIB
         mHInstance = GetModuleHandle( NULL );
 #    else
-#        if OGRE_DEBUG_MODE == 1
+#        if OGRE_DEBUG_MODE
         mHInstance = GetModuleHandle( "OgreMain_d.dll" );
 #        else
         mHInstance = GetModuleHandle( "OgreMain.dll" );

diff --git a/OgreMain/src/WIN32/OgreErrorDialog.cpp b/OgreMain/src/WIN32/OgreErrorDialog.cpp
@@ -44,7 +44,7 @@ namespace Ogre
 #    ifdef OGRE_STATIC_LIB
         mHInstance = GetModuleHandle( NULL );
 #    else
-#        if OGRE_DEBUG_MODE == 1
+#        if OGRE_DEBUG_MODE
         mHInstance = GetModuleHandle( "OgreMain_d.dll" );
 #        else
         mHInstance = GetModuleHandle( "OgreMain.dll" );

diff --git a/RenderSystems/GL3Plus/src/windowing/win32/OgreWin32GLSupport.cpp b/RenderSystems/GL3Plus/src/windowing/win32/OgreWin32GLSupport.cpp
@@ -503,7 +503,7 @@ namespace Ogre
 #    ifdef OGRE_STATIC_LIB
         hinst = GetModuleHandle( NULL );
 #    else
-#        if OGRE_DEBUG_MODE == 1
+#        if OGRE_DEBUG_MODE
         hinst = GetModuleHandle( "RenderSystem_GL3Plus_d.dll" );
 #        else
         hinst = GetModuleHandle( "RenderSystem_GL3Plus.dll" );

diff --git a/RenderSystems/GL3Plus/src/windowing/win32/OgreWin32Window.cpp b/RenderSystems/GL3Plus/src/windowing/win32/OgreWin32Window.cpp
@@ -404,7 +404,7 @@ namespace Ogre
 #    ifdef OGRE_STATIC_LIB
             hInstance = GetModuleHandle( NULL );
 #    else
-#        if OGRE_DEBUG_MODE == 1
+#        if OGRE_DEBUG_MODE
             hInstance = GetModuleHandle( "RenderSystem_GL3Plus_d.dll" );
 #        else
             hInstance = GetModuleHandle( "RenderSystem_GL3Plus.dll" );

diff --git a/RenderSystems/Vulkan/src/Windowing/win32/OgreVulkanWin32Window.cpp b/RenderSystems/Vulkan/src/Windowing/win32/OgreVulkanWin32Window.cpp
@@ -369,7 +369,7 @@ namespace Ogre
 #    ifdef OGRE_STATIC_LIB
             hInstance = GetModuleHandle( NULL );
 #    else
-#        if OGRE_DEBUG_MODE == 1
+#        if OGRE_DEBUG_MODE
             hInstance = GetModuleHandle( "RenderSystem_Vulkan_d.dll" );
 #        else
             hInstance = GetModuleHandle( "RenderSystem_Vulkan.dll" );