From fb109ec7e2bc57c89afdd46f3ae95e070c97c66c Mon Sep 17 00:00:00 2001 From: scrawl Date: Fri, 13 Jul 2012 11:30:47 +0200 Subject: [PATCH 1/2] use debug versions of ogre plugins in debug mode --- CMakeLists.txt | 6 ++++++ files/plugins.cfg.linux | 9 ++++----- files/plugins.cfg.mac | 8 ++++---- files/plugins.cfg.win32 | 10 +++++----- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84cef306e0..b561815ca3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,12 @@ set (OPENMW_VERSION_RELEASE 0) set (OPENMW_VERSION "${OPENMW_VERSION_MAJOR}.${OPENMW_VERSION_MINOR}.${OPENMW_VERSION_RELEASE}") +# Debug suffix for plugins +set(DEBUG_SUFFIX "") +if (${CMAKE_BUILD_TYPE} STREQUAL "Debug") + set(DEBUG_SUFFIX "_d") +endif() + # doxygen main page configure_file ("${OpenMW_SOURCE_DIR}/Docs/mainpage.hpp.cmake" "${OpenMW_SOURCE_DIR}/Docs/mainpage.hpp") diff --git a/files/plugins.cfg.linux b/files/plugins.cfg.linux index f34621a0f2..bbce1f1b40 100644 --- a/files/plugins.cfg.linux +++ b/files/plugins.cfg.linux @@ -4,9 +4,8 @@ PluginFolder=${OGRE_PLUGIN_DIR_REL} # Define plugins -Plugin=RenderSystem_GL -Plugin=Plugin_ParticleFX -Plugin=Plugin_OctreeSceneManager -Plugin=Plugin_CgProgramManager - +Plugin=RenderSystem_GL${OGRE_RenderSystem_GL_LIBRARIES} +Plugin=Plugin_ParticleFX${DEBUG_SUFFIX} +Plugin=Plugin_OctreeSceneManager${DEBUG_SUFFIX} +Plugin=Plugin_CgProgramManager${DEBUG_SUFFIX} diff --git a/files/plugins.cfg.mac b/files/plugins.cfg.mac index 3220708321..fac18dc8f8 100644 --- a/files/plugins.cfg.mac +++ b/files/plugins.cfg.mac @@ -4,9 +4,9 @@ PluginFolder=${OGRE_PLUGIN_DIR} # Define plugins -Plugin=RenderSystem_GL.1.8.0 -Plugin=Plugin_ParticleFX.1.8.0 -Plugin=Plugin_OctreeSceneManager.1.8.0 -Plugin=Plugin_CgProgramManager.1.8.0 +Plugin=RenderSystem_GL${DEBUG_SUFFIX}.1.8.0 +Plugin=Plugin_ParticleFX${DEBUG_SUFFIX}.1.8.0 +Plugin=Plugin_OctreeSceneManager${DEBUG_SUFFIX}.1.8.0 +Plugin=Plugin_CgProgramManager${DEBUG_SUFFIX}.1.8.0 diff --git a/files/plugins.cfg.win32 b/files/plugins.cfg.win32 index ea12c03940..6b4e9ef9dc 100644 --- a/files/plugins.cfg.win32 +++ b/files/plugins.cfg.win32 @@ -4,10 +4,10 @@ PluginFolder=.\ # Define plugins -Plugin=RenderSystem_Direct3D9 -Plugin=RenderSystem_GL -Plugin=Plugin_ParticleFX -Plugin=Plugin_OctreeSceneManager -Plugin=Plugin_CgProgramManager +Plugin=RenderSystem_Direct3D9${DEBUG_SUFFIX} +Plugin=RenderSystem_GL${DEBUG_SUFFIX} +Plugin=Plugin_ParticleFX${DEBUG_SUFFIX} +Plugin=Plugin_OctreeSceneManager${DEBUG_SUFFIX} +Plugin=Plugin_CgProgramManager${DEBUG_SUFFIX} From 1429c8d5cb088780d6cd969f2eb807f7f41b49e1 Mon Sep 17 00:00:00 2001 From: scrawl Date: Fri, 13 Jul 2012 12:43:48 +0200 Subject: [PATCH 2/2] copy&paste mistake --- files/plugins.cfg.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/plugins.cfg.linux b/files/plugins.cfg.linux index bbce1f1b40..7b8d99e8fd 100644 --- a/files/plugins.cfg.linux +++ b/files/plugins.cfg.linux @@ -4,7 +4,7 @@ PluginFolder=${OGRE_PLUGIN_DIR_REL} # Define plugins -Plugin=RenderSystem_GL${OGRE_RenderSystem_GL_LIBRARIES} +Plugin=RenderSystem_GL${DEBUG_SUFFIX} Plugin=Plugin_ParticleFX${DEBUG_SUFFIX} Plugin=Plugin_OctreeSceneManager${DEBUG_SUFFIX} Plugin=Plugin_CgProgramManager${DEBUG_SUFFIX}