Set up premake so that VST3 and AU both link, and AU works.

kurasu · Dec 17, 2018 · ce3b57d · ce3b57d
1 parent d835e2e
commit ce3b57d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/premake5.lua b/premake5.lua
@@ -183,8 +183,6 @@ function plugincommon()
 			"src/mac/**.cpp",
 			"src/mac/**.h",
 			"libs/vst/*.mm",
-            "libs/AUPublic/*.cpp",
-            "libs/PublicUtility/*.cpp", 
 			VSTGUI .. "vstgui_mac.mm",
 			VSTGUI .. "vstgui_uidescription_mac.mm",
 		}
@@ -467,9 +465,9 @@ if (os.istarget("macosx")) then
 		"src/au/**.cpp",
                 "src/au/**.mm",        
 		"src/au/**.h",
-		"libs/AudioUnits/AUPublic/**.cpp",
-		"libs/AudioUnits/AUPublic/**.h",
-		"libs/AudioUnits/PublicUtility/*.cpp",
+		"libs/AUPublic/**.cpp",
+		"libs/AUPublic/**.h",
+		"libs/PublicUtility/*.cpp",
 		VSTGUI .. "plugin-bindings/plugguieditor.cpp",
 	}
 

diff --git a/src/vst3/SurgeVst3EditController.cpp b/src/vst3/SurgeVst3EditController.cpp
@@ -2,7 +2,7 @@
 
 #include "pluginterfaces/base/ustring.h"
 
-#if !TARGET_AUDIOUNIT
+#if !TARGET_AUDIOUNIT && !MAC
 tresult PLUGIN_API SurgeVst3EditController::initialize(FUnknown* context)
 {
    tresult result = EditControllerEx1::initialize(context);

diff --git a/src/vst3/SurgeVst3EditController.h b/src/vst3/SurgeVst3EditController.h
@@ -4,7 +4,7 @@ using namespace Steinberg;
 using namespace Steinberg::Vst;
 
 class SurgeEditorView;
-#if !TARGET_AUDIOUNIT
+#if !TARGET_AUDIOUNIT && !MAC
 
 class SurgeVst3EditController : public EditControllerEx1, public IMidiMapping
 {