Merge branch 'master' of https://github.com/kurasu/Surge

baconpaul · Dec 18, 2018 · 114de69 · 114de69
2 parents 719b75d + 3cd6775
commit 114de69
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/common/gui/PopupEditorDialog.cpp b/src/common/gui/PopupEditorDialog.cpp
@@ -139,4 +139,14 @@ void spawn_miniedit_text(char* c, int maxchars)
       strncpy(c, me.textdata, maxchars);
    }
 }
-#endif
+#elif __linux__
+
+#include <stdio.h>
+
+void spawn_miniedit_text(char* c, int maxchars)
+{
+   // FIXME: Implement text edit popup on Linux.
+   fprintf(stderr, "%s: text edit popup is not implemented.\n", __func__);
+}
+
+#endif
diff --git a/src/vst2/Vst2PluginInstance.cpp b/src/vst2/Vst2PluginInstance.cpp
@@ -25,6 +25,10 @@
 
 using namespace std;
 
+#if __linux__
+namespace VSTGUI { void* soHandle = nullptr; }
+#endif
+
 //-------------------------------------------------------------------------------------------------------
 
 AudioEffect* createEffectInstance(audioMasterCallback audioMaster)