When finding (MSVC built) panner DLLs, make sure we only find ones that match our...

Will most likely also need to get done for similarly "discovered" DLLs (backends / surfaces etc). TBC

diff --git a/libs/ardour/panner_manager.cc b/libs/ardour/panner_manager.cc
index 00329c7bbe073f15767ce4ae7b72f8a6691918c9..b14c7c79cf532efcf4a969e9495c327f4ef0ac47 100644 (file)
--- a/libs/ardour/panner_manager.cc
+++ b/libs/ardour/panner_manager.cc
@@ -63,7 +63,24 @@ PannerManager::instance ()
 
 static bool panner_filter (const string& str, void */*arg*/)
 {
-#ifdef __APPLE__
+#ifdef COMPILER_MSVC
+   /**
+    * Different build targets (Debug / Release etc) use different versions
+    * of the 'C' runtime (which can't be 'mixed & matched'). Therefore, in
+    * case the supplied search path contains multiple version(s) of a given
+    * panner module, only select the one(s) which match the current build
+    * target (otherwise, all hell will break loose !!)
+    */
+       #if defined (_DEBUG)
+               return str.length() > 12 && (str.find ("panner_") == 0) && (str.find ("D.dll") == (str.length() - 5));
+       #elif defined (RDC_BUILD)
+               return str.length() > 14 && (str.find ("panner_") == 0) && (str.find ("RDC.dll") == (str.length() - 7));
+       #elif defined (_WIN64)
+               return str.length() > 13 && (str.find ("panner_") == 0) && (str.find ("64.dll") == (str.length() - 6));
+       #else
+               return str.length() > 13 && (str.find ("panner_") == 0) && (str.find ("32.dll") == (str.length() - 6));
+       #endif
+#elif defined (__APPLE__)
        return str[0] != '.' && (str.length() > 6 && str.find (".dylib") == (str.length() - 6));
 #else
        return str[0] != '.' && (str.length() > 3 && (str.find (".so") == (str.length() - 3) || str.find (".dll") == (str.length() - 4)));

diff --git a/msvc_extra_headers/ardourext/sys/targetsxs.h.input b/msvc_extra_headers/ardourext/sys/targetsxs.h.input
index 51177b637530fe69a4ae6e9a17622d4baf411b23..8fbf1327f88bc5f07dbd1bc6f2481799a6cb20be 100644 (file)
--- a/msvc_extra_headers/ardourext/sys/targetsxs.h.input
+++ b/msvc_extra_headers/ardourext/sys/targetsxs.h.input
@@ -29,6 +29,11 @@
 /* #define to zero for a more conventional Debug build */
 #endif
 
+#if !defined(DEBUG) && !defined(NDEBUG)
+/* Assume a debuggable Release build (RDC build) */
+#define RDC_BUILD 1
+#endif
+
 #ifndef __midl
 #if defined(_DEBUG) || defined (DEBUG)
 /* Experimental - link to the lowest DebugCRT so we can run on another system */