Fix plugins being searched in lib/ when it should be bin/ and vice versa.

Ugh. I must have been drunk when writing this. Also, why nobody complained
until now? Interesting.

doc/changelog.dox

@@ -237,6 +237,9 @@ See also:
     @ref Corrade/Containers/StridedArrayView.h to be included *before* in order
     to use the @ref ImageView::pixels() "pixels()" function. Now it's enough
     to just include it at any point, with no order dependency anymore.
+-   Dynamic plugins on static Magnum builds on Windows were accidentally
+    searched for in the `lib/` directory instead of `bin/`, and in some cases
+    in `bin/` instead of `lib/` on Unix platforms.
 
 @subsection changelog-latest-deprecated Deprecated APIs
 

src/Magnum/Audio/AbstractImporter.cpp

@@ -44,17 +44,28 @@ std::string AbstractImporter::pluginInterface() {
 #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
 std::vector<std::string> AbstractImporter::pluginSearchPaths() {
     return {
+        /* Debug build */
         #ifdef CORRADE_IS_DEBUG_BUILD
         #ifndef MAGNUM_BUILD_STATIC
         Utility::Directory::join(Utility::Directory::path(Utility::Directory::libraryLocation(&pluginInterface)), "magnum-d/audioimporters"),
         #else
+        #ifndef CORRADE_TARGET_WINDOWS
+        /* On Windows, the plugin DLLs are next to the executable, so the one
+           below works. Elsewhere the plugins are in the lib dir instead */
+        "../lib/magnum-d/audioimporters",
+        #endif
         "magnum-d/audioimporters",
         #endif
         Utility::Directory::join(MAGNUM_PLUGINS_DEBUG_DIR, "audioimporters")
+
+        /* Release build */
         #else
         #ifndef MAGNUM_BUILD_STATIC
         Utility::Directory::join(Utility::Directory::path(Utility::Directory::libraryLocation(&pluginInterface)), "magnum/audioimporters"),
         #else
+        #ifndef CORRADE_TARGET_WINDOWS
+        "../lib/magnum/audioimporters",
+        #endif
         "magnum/audioimporters",
         #endif
         Utility::Directory::join(MAGNUM_PLUGINS_DIR, "audioimporters")

src/Magnum/Text/AbstractFont.cpp

@@ -49,11 +49,12 @@ std::string AbstractFont::pluginInterface() {
 #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
 std::vector<std::string> AbstractFont::pluginSearchPaths() {
     return {
+        /* Debug build */
         #ifdef CORRADE_IS_DEBUG_BUILD
         #ifndef MAGNUM_BUILD_STATIC
         Utility::Directory::join(Utility::Directory::path(Utility::Directory::libraryLocation(&pluginInterface)), "magnum-d/fonts"),
         #else
-        #ifndef MAGNUM_TARGET_WINDOWS
+        #ifndef CORRADE_TARGET_WINDOWS
         /* On Windows, the plugin DLLs are next to the executable, so the one
            below works. Elsewhere the plugins are in the lib dir instead */
         "../lib/magnum-d/fonts",
@@ -61,11 +62,13 @@ std::vector<std::string> AbstractFont::pluginSearchPaths() {
         "magnum-d/fonts",
         #endif
         Utility::Directory::join(MAGNUM_PLUGINS_DEBUG_DIR, "fonts")
+
+        /* Release build */
         #else
         #ifndef MAGNUM_BUILD_STATIC
         Utility::Directory::join(Utility::Directory::path(Utility::Directory::libraryLocation(&pluginInterface)), "magnum/fonts"),
         #else
-        #ifndef MAGNUM_TARGET_WINDOWS
+        #ifndef CORRADE_TARGET_WINDOWS
         "../lib/magnum/fonts",
         #endif
         "magnum/fonts",

src/Magnum/Text/AbstractFontConverter.cpp

@@ -63,17 +63,28 @@ std::string AbstractFontConverter::pluginInterface() {
 #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
 std::vector<std::string> AbstractFontConverter::pluginSearchPaths() {
     return {
+        /* Debug build */
         #ifdef CORRADE_IS_DEBUG_BUILD
         #ifndef MAGNUM_BUILD_STATIC
         Utility::Directory::join(Utility::Directory::path(Utility::Directory::libraryLocation(&pluginInterface)), "magnum-d/fontconverters"),
         #else
+        #ifndef CORRADE_TARGET_WINDOWS
+        /* On Windows, the plugin DLLs are next to the executable, so the one
+           below works. Elsewhere the plugins are in the lib dir instead */
+        "../lib/magnum-d/fontconverters",
+        #endif
         "magnum-d/fontconverters",
         #endif
         Utility::Directory::join(MAGNUM_PLUGINS_DEBUG_DIR, "fontconverters")
+
+        /* Release build */
         #else
         #ifndef MAGNUM_BUILD_STATIC
         Utility::Directory::join(Utility::Directory::path(Utility::Directory::libraryLocation(&pluginInterface)), "magnum/fontconverters"),
         #else
+        #ifndef CORRADE_TARGET_WINDOWS
+        "../lib/magnum/fontconverters",
+        #endif
         "magnum/fontconverters",
         #endif
         Utility::Directory::join(MAGNUM_PLUGINS_DIR, "fontconverters")

src/Magnum/Trade/AbstractImageConverter.cpp

@@ -49,11 +49,12 @@ std::string AbstractImageConverter::pluginInterface() {
 #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
 std::vector<std::string> AbstractImageConverter::pluginSearchPaths() {
     return {
+        /* Debug build */
         #ifdef CORRADE_IS_DEBUG_BUILD
         #ifndef MAGNUM_BUILD_STATIC
         Utility::Directory::join(Utility::Directory::path(Utility::Directory::libraryLocation(&pluginInterface)), "magnum-d/imageconverters"),
         #else
-        #ifndef MAGNUM_TARGET_WINDOWS
+        #ifndef CORRADE_TARGET_WINDOWS
         /* On Windows, the plugin DLLs are next to the executable, so the one
            below works. Elsewhere the plugins are in the lib dir instead */
         "../lib/magnum-d/imageconverters",
@@ -61,11 +62,13 @@ std::vector<std::string> AbstractImageConverter::pluginSearchPaths() {
         "magnum-d/imageconverters",
         #endif
         Utility::Directory::join(MAGNUM_PLUGINS_DEBUG_DIR, "imageconverters")
+
+        /* Release build */
         #else
         #ifndef MAGNUM_BUILD_STATIC
         Utility::Directory::join(Utility::Directory::path(Utility::Directory::libraryLocation(&pluginInterface)), "magnum/imageconverters"),
         #else
-        #ifndef MAGNUM_TARGET_WINDOWS
+        #ifndef CORRADE_TARGET_WINDOWS
         "../lib/magnum/imageconverters",
         #endif
         "magnum/imageconverters",

src/Magnum/Trade/AbstractImporter.cpp

@@ -58,11 +58,12 @@ std::string AbstractImporter::pluginInterface() {
 #ifndef CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT
 std::vector<std::string> AbstractImporter::pluginSearchPaths() {
     return {
+        /* Debug build */
         #ifdef CORRADE_IS_DEBUG_BUILD
         #ifndef MAGNUM_BUILD_STATIC
         Utility::Directory::join(Utility::Directory::path(Utility::Directory::libraryLocation(&pluginInterface)), "magnum-d/importers"),
         #else
-        #ifndef MAGNUM_TARGET_WINDOWS
+        #ifndef CORRADE_TARGET_WINDOWS
         /* On Windows, the plugin DLLs are next to the executable, so the one
            below works. Elsewhere the plugins are in the lib dir instead */
         "../lib/magnum-d/importers",
@@ -70,13 +71,13 @@ std::vector<std::string> AbstractImporter::pluginSearchPaths() {
         "magnum-d/importers",
         #endif
         Utility::Directory::join(MAGNUM_PLUGINS_DEBUG_DIR, "importers")
-        #ifdef CORRADE_TARGET_WINDOWS
+
-        #endif
+        /* Release build */
         #else
         #ifndef MAGNUM_BUILD_STATIC
         Utility::Directory::join(Utility::Directory::path(Utility::Directory::libraryLocation(&pluginInterface)), "magnum/importers"),
         #else
-        #ifndef MAGNUM_TARGET_WINDOWS
+        #ifndef CORRADE_TARGET_WINDOWS
         "../lib/magnum/importers",
         #endif
         "magnum/importers",