From 38997d34f21659b46949ee1b40c08042048603b2 Mon Sep 17 00:00:00 2001 From: dnk-88 Date: Sun, 23 Oct 2011 00:30:28 +0300 Subject: [PATCH 1/2] Fixed: #1193 In debug mode ovqt trying to load plugins witj suffix _d.dll instead _r.dll. --- .../src/extension_system/plugin_spec.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.cpp b/code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.cpp index 5c4e04ecb..c76e19298 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.cpp @@ -61,14 +61,19 @@ PluginSpec::PluginSpec() m_plugin(0), m_pluginManager(0) { -#ifdef Q_OS_WIN -# ifdef DEBUG - m_suffix = "_d.dll"; +// Compilation mode specific suffixes +#ifdef NL_OS_WINDOWS +# if defined(NL_DEBUG) +m_suffix = "_d.dll"; +# elif defined(NL_RELEASE) +m_suffix = "_r.dll"; # else - m_suffix = "_r.dll"; +# error "Unknown compilation mode, can't build suffix" # endif +#elif defined (NL_OS_UNIX) +m_suffix = ".so"; #else - m_suffix = ".so"; +# error "You must define the lib suffix for your platform" #endif } From dab8c80928de965ed1ae831a18153d4f0995e474 Mon Sep 17 00:00:00 2001 From: dnk-88 Date: Sun, 23 Oct 2011 00:32:49 +0300 Subject: [PATCH 2/2] Fixed: #1193 Clean up code. --- .../object_viewer_qt/src/extension_system/plugin_spec.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.cpp b/code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.cpp index c76e19298..1e3ec0182 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/extension_system/plugin_spec.cpp @@ -64,14 +64,14 @@ PluginSpec::PluginSpec() // Compilation mode specific suffixes #ifdef NL_OS_WINDOWS # if defined(NL_DEBUG) -m_suffix = "_d.dll"; + m_suffix = "_d.dll"; # elif defined(NL_RELEASE) -m_suffix = "_r.dll"; + m_suffix = "_r.dll"; # else # error "Unknown compilation mode, can't build suffix" # endif #elif defined (NL_OS_UNIX) -m_suffix = ".so"; + m_suffix = ".so"; #else # error "You must define the lib suffix for your platform" #endif