moved the qt5apendix to the plugins folder in order to also load vamp…

… plugIns qtdependent.
mixxxdj · Jun 7, 2018 · 9d72243 · 9d72243
1 parent a489e77
commit 9d72243
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/SConscript b/src/SConscript
@@ -380,7 +380,7 @@ if build.platform_is_linux or build.platform_is_bsd:
 
                 if qt5:
                     soundsource_plugins = env.Install(
-                            os.path.join(unix_lib_path, 'mixxx', 'plugins', 'soundsourceqt5'),
+                            os.path.join(unix_lib_path, 'mixxx', 'pluginsqt5', 'soundsource'),
                             soundsource_plugin_files)
                 else: 
                     soundsource_plugins = env.Install(
@@ -560,7 +560,7 @@ if build.platform_is_windows:
         #icon = env.Install(base_dist_dir+"", icon_files)
         dlls = env.Install(base_dist_dir+"/", dll_files)
         if qt5:
-            soundsource_plugins = env.Install(os.path.join(base_dist_dir, "plugins", "soundsourceqt5/"),
+            soundsource_plugins = env.Install(os.path.join(base_dist_dir, "pluginsqt5", "soundsource/"),
                                               soundsource_plugin_files)
         else:
             soundsource_plugins = env.Install(os.path.join(base_dist_dir, "plugins", "soundsource/"),

diff --git a/src/sources/soundsourceproxy.cpp b/src/sources/soundsourceproxy.cpp
@@ -53,10 +53,19 @@ const QStringList SOUND_SOURCE_PLUGIN_FILENAME_PATTERN; // empty
 QList<QDir> getSoundSourcePluginDirectories() {
 
     #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-        QString soundsourceDir = "soundsourceqt5";
+        const QString pluginDir = "pluginsqt5";
+        #ifdef __APPLE__
+            const QString pluginDir2 = pluginDir;
+        #endif
     #else
-        QString soundsourceDir = "soundsource";
+        #ifdef __APPLE__
+            const QString pluginDir = "PlugIns";
+            const QString pluginDir2 = "Plugins";
+        #else
+            const QString pluginDir = "plugins";
+        #endif
     #endif
+    const QString soundsourceDir = "soundsource";
 
     QList<QDir> pluginDirs;
 
@@ -75,12 +84,12 @@ QList<QDir> getSoundSourcePluginDirectories() {
     // 'bin' folder of $PREFIX, so we just traverse
     // ../lib/mixxx/plugins/soundsource.
     QDir libPluginDir(UNIX_LIB_PATH);
-    if (libPluginDir.cd("plugins") && libPluginDir.cd(soundsourceDir)) {
+    if (libPluginDir.cd(pluginDir) && libPluginDir.cd(soundsourceDir)) {
         pluginDirs << libPluginDir;
     }
 
     QDir dataPluginDir(dataLocation);
-    if (dataPluginDir.cd("plugins") && dataPluginDir.cd(soundsourceDir)) {
+    if (dataPluginDir.cd(pluginDir) && dataPluginDir.cd(soundsourceDir)) {
         pluginDirs << dataPluginDir;
     }
 
@@ -95,7 +104,7 @@ QList<QDir> getSoundSourcePluginDirectories() {
     }
 #elif __WINDOWS__
     QDir appPluginDir(applicationPath);
-    if (appPluginDir.cd("plugins") && appPluginDir.cd(soundsourceDir)) {
+    if (appPluginDir.cd(pluginDir) && appPluginDir.cd(soundsourceDir)) {
         pluginDirs << appPluginDir;
     }
 #elif __APPLE__
@@ -104,7 +113,7 @@ QList<QDir> getSoundSourcePluginDirectories() {
     // :( so we can't do:
     //blah/Mixxx.app/Contents/PlugIns/soundsource
     QDir bundlePluginDir(applicationPath);
-    if (bundlePluginDir.cdUp() && bundlePluginDir.cd("PlugIns")) {
+    if (bundlePluginDir.cdUp() && bundlePluginDir.cd(pluginDir)) {
         pluginDirs << bundlePluginDir;
     }
 
@@ -119,7 +128,7 @@ QList<QDir> getSoundSourcePluginDirectories() {
     }
 
     QDir dataPluginDir(dataLocation);
-    if (dataPluginDir.cd("Plugins") && dataPluginDir.cd(soundsourceDir)) {
+    if (dataPluginDir.cd(pluginDir2) && dataPluginDir.cd(soundsourceDir)) {
         pluginDirs << dataPluginDir;
     }
 #endif