Build Element Plugins With Meson

.vscode/c_cpp_properties.json

@@ -3,77 +3,13 @@
     "configurations": [
         {
             "name": "OSX",
-            "includePath": [
-                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
-                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/11.0.0/include",
-                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
-                "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include",
-                "/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
-                "/opt/kushview/include",
-                "/usr/local/include",
-                "/usr/local/Cellar/jack/0.125.0_3/include",
-                "${workspaceRoot}/libs/JUCE/modules",
-                "${workspaceRoot}/libs/kv/modules",
-                "${workspaceRoot}/libs/jlv2/modules",
-                "${workspaceRoot}/libs/compat",
-                "${workspaceRoot}/libs/lua",
-                "${workspaceRoot}/libs/lua/src",
-                "${workspaceRoot}/src",
-                "${workspaceRoot}/tests"
-            ],
-            "defines": [
-                "JUCE_PLUGINHOST_VST=1",
-                "JLV2_PLUGINHOST_LV2=1",
-                "VSCODE=1",
-                "EL_DOCKING=1",
-                "KV_DOCKING_WINDOWS=1",
-                "KV_JACK_AUDIO=1",
-                "HAVE_PYTHON=1",
-                "EL_USE_LOCAL_AUTH=1",
-                "EL_PRO=1"
-            ],
-            "forcedInclude": [
-                "${workspaceRoot}/.vscode/vscode.h"
-            ],
-            "intelliSenseMode": "clang-x64",
-            "browse": {
-                "path": [
-                    "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
-                    "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/11.0.0/include",
-                    "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
-                    "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include",
-                    "/System/Library/Frameworks/Python.framework/Versions/2.7/include/python2.7",
-                    "/usr/local/include",
-                    "/usr/local/Cellar/jack/0.125.0_3/include",
-                    "${workspaceRoot}/build/include/*",
-                    "${workspaceRoot}/libs/element/src/*",
-                    "${workspaceRoot}/libs/element/include/*",
-                    "${workspaceRoot}/libs/lua/*",
-                    "${workspaceRoot}/libs/JUCE/modules/*",
-                    "${workspaceRoot}/libs/kv/modules/*",
-                    "${workspaceRoot}/libs/compat/*",
-                    "${workspaceRoot}/src/*",
-                    "${workspaceRoot}/test/*"
-                ],
-                "limitSymbolsToIncludedHeaders": true,
-                "databaseFilename": ""
-            },
-            "macFrameworkPath": [
-                "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks"
-            ],
-            "compilerPath": "/usr/bin/clang",
-            "cStandard": "c11",
-            "cppStandard": "c++17"
-        },
-        {
-            "name": "OSX Generic",
-            "intelliSenseMode": "${default}",
+            "intelliSenseMode": "macos-clang-x64",
             "cStandard": "c11",
             "cppStandard": "c++17",
             "defines": [
                 "JUCE_PLUGINHOST_VST=1",
-                "JLV2_PLUGINHOST_LV2=1",
-                "VSCODE=1",
+                "JUCE_PLUGINHOST_VST3=1",
+                "JUCE_PLUGINHOST_AU=1",
                 "EL_DOCKING=1",
                 "KV_DOCKING_WINDOWS=1",
                 "KV_JACK_AUDIO=1",
@@ -85,18 +21,19 @@
                 "${workspaceRoot}/.vscode/vscode.h"
             ],
             "includePath": [
-                "${workspaceRoot}/build/include/*",
-                "${workspaceRoot}/libs/element/src/*",
-                "${workspaceRoot}/libs/element/include/*",
+                "${workspaceRoot}/build/libs/compat/*",
                 "${workspaceRoot}/libs/lua/*",
                 "${workspaceRoot}/libs/JUCE/modules/*",
                 "${workspaceRoot}/libs/kv/modules/*",
                 "${workspaceRoot}/libs/compat/*",
                 "${workspaceRoot}/src/*",
                 "${workspaceRoot}/test/*",
                 "/opt/kushview/include/*",
+                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
+                "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
                 "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include"
-            ]
+            ],
+            "compileCommands": "${workspaceFolder}/build/compile_commands.json"
         },
         {
             "name": "Linux",
@@ -108,15 +45,15 @@
                 "/usr/include/serd-0/*",
                 "/usr/include/sord-0/*",
                 "/usr/include/sratom-0/*",
+                "${workspaceFolder}/build/libs/compat/*",
                 "${workspaceFolder}/libs/lua/src/*",
                 "${workspaceFolder}/libs/sol/*",
                 "${workspaceFolder}/libs/JUCE/modules/*",
                 "${workspaceFolder}/libs/kv/modules/*",
                 "${workspaceFolder}/libs/compat/*",
                 "${workspaceFolder}/include/*",
                 "${workspaceFolder}/src/*",
-                "${workspaceFolder}/test/*",
-                "${workspaceFolder}/build-native/libs/compat/*"
+                "${workspaceFolder}/test/*"
             ],
             "defines": [
                 "LUA_USE_READLINE=1",
@@ -134,7 +71,7 @@
             },
             "cStandard": "c11",
             "cppStandard": "c++17",
-            "compileCommands": "${workspaceFolder}/build-native/compile_commands.json"
+            "compileCommands": "${workspaceFolder}/build/compile_commands.json"
         },
         {
             "name": "Win32",
@@ -146,7 +83,8 @@
                 "${workspaceFolder}/libs/lua/src/*",
                 "${workspaceFolder}/include/*",
                 "${workspaceFolder}/src/*",
-                "${workspaceFolder}/test/*"
+                "${workspaceFolder}/test/*",
+                "${workspaceFolder}/build/libs/compat/*"
             ],
             "defines": [
                 "_DEBUG",
@@ -159,7 +97,7 @@
             "cStandard": "c17",
             "cppStandard": "c++17",
             "intelliSenseMode": "windows-msvc-x64",
-            "compileCommands": "build-native/compile_commands.json"
+            "compileCommands": "build/compile_commands.json"
         }
     ]
 }

.vscode/launch.json

@@ -21,8 +21,8 @@
             "type": "cppdbg",
             "request": "launch",
             "args": [],
-            "program": "${workspaceRoot}/build-native/element",
-            "cwd": "${workspaceFolder}/build-native",
+            "program": "${workspaceRoot}/build/element",
+            "cwd": "${workspaceFolder}/build",
             "environment": [
                 { "name": "LD_LIBRARY_PATH", "value": "${workspaceRoot}/build/lib" },
                 { "name": "LUA_PATH", "value": "${workspaceRoot}/libs/lua/?.lua" },

.vscode/settings.json

@@ -93,5 +93,6 @@
         "typeinfo": "cpp",
         "bit": "cpp"
     },
-    "C_Cpp.intelliSenseMemoryLimit": 1024
+    "C_Cpp.intelliSenseMemoryLimit": 1024,
+    "mesonbuild.buildFolder": "build"
 }

.vscode/tasks.json

@@ -4,9 +4,9 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "label": "Waf Build",
+            "label": "Build",
             "type": "shell",
-            "command": "python waf build",
+            "command": "meson compile -C build",
             "group": {
                 "kind": "build",
                 "isDefault": true
@@ -26,116 +26,6 @@
                     "message": 5
                 }
             }
-        },
-        {
-            "label": "Waf Check",
-            "type": "shell",
-            "command": "python waf check"
-        },
-        {
-            "label": "Waf Clean",
-            "type": "shell",
-            "command": "python waf clean"
-        },
-        {
-            "label": "Waf Rebuild",
-            "type": "shell",
-            "command": "python",
-            "args": [
-                "waf",
-                "clean",
-                "build"
-            ],
-            "problemMatcher": []
-        },
-        {
-            "label": "Waf Docs",
-            "type": "shell",
-            "command": "python",
-            "args": [
-                "waf",
-                "docs"
-            ],
-            "problemMatcher": []
-        },
-        {
-            "label": "Waf Configure (no jack, no lua)",
-            "type": "shell",
-            "command": "python",
-            "args": [
-                "waf",
-                "configure",
-                "--test",
-                "--without-jack",
-                "--without-lua",
-                "--debug"
-            ],
-            "options": {
-                "env": {
-                    "CXXFLAGS": "-I/usr/local/include -I/opt/kushview/include -I/opt/kushview/vstsdk2.4",
-                    "CC": "ccache clang",
-                    "CXX": "ccache clang++"
-                }
-            },
-            "problemMatcher": []
-        },
-        {
-            "label": "Waf Configure (no jack)",
-            "type": "shell",
-            "command": "python",
-            "args": [
-                "waf",
-                "configure",
-                "--test",
-                "--without-jack",
-                "--debug"
-            ],
-            "options": {
-                "env": {
-                    "CXXFLAGS": "-I/usr/local/include -I/opt/kushview/include -I/opt/kushview/vstsdk2.4",
-                    "CC": "ccache clang",
-                    "CXX": "ccache clang++"
-                }
-            },
-            "problemMatcher": []
-        },
-        {
-            "label": "Waf Configure",
-            "type": "shell",
-            "command": "python",
-            "args": [
-                "waf",
-                "configure",
-                "--test",
-                "--debug"
-            ],
-            "options": {
-                "env": {
-                    "CXXFLAGS": "-I/usr/local/include -I/opt/kushview/include -I/opt/kushview/vstsdk2.4",
-                    "CC": "ccache clang",
-                    "CXX": "ccache clang++"
-                }
-            },
-            "problemMatcher": []
-        },
-        {
-            "label": "Waf Configure (workspaces)",
-            "type": "shell",
-            "command": "python",
-            "args": [
-                "waf",
-                "configure",
-                "--debug",
-                "--enable-docking"
-            ],
-            "options": {
-                "env": {
-                    "CXXFLAGS": "-I/opt/kushview/include -I/opt/kushview/vstsdk2.4",
-                    "CC": "ccache clang",
-                    "CXX": "ccache clang++"
-                }
-            },
-            "problemMatcher": []
         }
     ]
 }

libs/compat/JucePluginDefines.h

@@ -11,13 +11,13 @@
 // Audio plugin settings..
 
 #ifndef  JucePlugin_Build_VST
- #define JucePlugin_Build_VST              1
+ #define JucePlugin_Build_VST              0
 #endif
 #ifndef  JucePlugin_Build_VST3
- #define JucePlugin_Build_VST3             1
+ #define JucePlugin_Build_VST3             0
 #endif
 #ifndef  JucePlugin_Build_AU
- #define JucePlugin_Build_AU               1
+ #define JucePlugin_Build_AU               0
 #endif
 #ifndef  JucePlugin_Build_AUv3
  #define JucePlugin_Build_AUv3             0
@@ -26,7 +26,7 @@
  #define JucePlugin_Build_RTAS             0
 #endif
 #ifndef  JucePlugin_Build_AAX
- #define JucePlugin_Build_AAX              1
+ #define JucePlugin_Build_AAX              0
 #endif
 #ifndef  JucePlugin_Build_Standalone
  #define JucePlugin_Build_Standalone       0

libs/compat/include_juce_audio_plugin_client_AU.r

@@ -0,0 +1,9 @@
+/*
+
+    IMPORTANT! This file is auto-generated each time you save your
+    project - if you alter its contents, your changes may be overwritten!
+
+*/
+
+#include "juce_config.hsss"
+#include <juce_audio_plugin_client_AU.r>

libs/compat/include_juce_audio_plugin_client_AU_1.mm

@@ -0,0 +1,10 @@
+/*
+
+    IMPORTANT! This file is auto-generated each time you save your
+    project - if you alter its contents, your changes may be overwritten!
+
+*/
+
+#include "juce_config.h"
+#include "pluginconfig.h"
+#include <juce_audio_plugin_client/juce_audio_plugin_client_AU_1.mm>

libs/compat/include_juce_audio_plugin_client_AU_2.mm

@@ -0,0 +1,10 @@
+/*
+
+    IMPORTANT! This file is auto-generated each time you save your
+    project - if you alter its contents, your changes may be overwritten!
+
+*/
+
+#include "juce_config.h"
+#include "pluginconfig.h"
+#include <juce_audio_plugin_client/juce_audio_plugin_client_AU_2.mm>

libs/compat/include_juce_audio_plugin_client_VST2.cpp

@@ -1,4 +1,4 @@
 
-#include "./AppConfig.h"
+#include "juce_config.h"
 #include "./JucePluginDefines.h"
 #include <juce_audio_plugin_client/juce_audio_plugin_client_VST2.cpp>

libs/compat/include_juce_audio_plugin_client_VST3.cpp

@@ -1,4 +1,4 @@
 
-#include "AppConfig.h"
-#include "../tools/jucer/Element/JuceLibraryCode/JucePluginDefines.h"
+#include "juce_config.h"
+#include "./JucePluginDefines.h"
 #include <juce_audio_plugin_client/juce_audio_plugin_client_VST3.cpp>

libs/compat/include_juce_audio_plugin_client_utils.cpp

@@ -1,3 +1,3 @@
-#include "AppConfig.h"
-#include "JucePluginDefines.h"
+#include "juce_config.h"
+#include "pluginconfig.h"
 #include <juce_audio_plugin_client/juce_audio_plugin_client_utils.cpp>

meson.build

@@ -60,6 +60,8 @@ element_app = executable ('element', element_app_sources,
     link_args : element_app_link_args,
     link_with : [ libelement ])
 
+subdir ('src/plugins')
+
 if host_machine.system() == 'linux'
     subdir ('tools/lindeploy')
 elif host_machine.system() == 'darwin'

scripts/meson.build

@@ -5,7 +5,7 @@ scripts_install_dir = get_option('datadir') / 'element/scripts'
 if host_machine.system() == 'windows'
     scripts_install_dir = get_option('bindir') / 'scripts'
 elif host_machine.system() == 'darwin'
-    scripts_install_dir = 'Contents/Resources/Scripts'
+    scripts_install_dir = 'Element.app/Contents/Resources/scripts'
 endif
 
 install_data (