Copy vstsdk sources to build tree before compilation.

3 files changed, 67 insertions, 14 deletions

diff --git a/configure.ac b/configure.ac
index 6a38c8a..7e6695c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ AM_INIT_AUTOMAKE
 
 AC_PROG_CXX
 AM_PROG_CC_C_O
+AC_PROG_MKDIR_P
 
 LT_INIT
 
@@ -178,7 +179,7 @@ AC_ARG_ENABLE([vst],
 AS_IF(
   [test "x$enable_vst" = "xyes"],
   [enable_vst=yes
-  VST_CPPFLAGS="-I$with_vst_sources -D__int64='long long int'"
+  VST_CPPFLAGS="-D__int64='long long int'"
 
 	# Set up platform specific workarounds for the VST SDK
 	AS_CASE([$host_os],
@@ -608,6 +609,7 @@ AC_CONFIG_FILES(
 	tools/Makefile
 	src/Makefile
 	plugin/Makefile
+	plugin/vst/Makefile
 	plugingui/Makefile
 	include/Makefile
 	man/Makefile
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index 15ca7d0..7e256ba 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = vst
+
 include $(top_srcdir)/plugingui/Makefile.am.plugingui
 include $(top_srcdir)/src/Makefile.am.drumgizmo
 
@@ -33,22 +35,11 @@ if ENABLE_VST
 vstplugindir = $(libdir)/vst
 vstplugin_LTLIBRARIES = drumgizmo_vst.la
 vstplugin_DATA =
-noinst_LTLIBRARIES = libvstsdk.la
 endif
 
-VST_BASE = ${VST_SOURCE_PATH}
-VST_SRC_BASE = ${VST_BASE}/public.sdk/source/vst2.x/
-
-# Hack to compile vst sources without -Wall -Werror
-libvstsdk_la_CXXFLAGS = -w $(VST_CPPFLAGS)
-nodist_libvstsdk_la_SOURCES = \
-	${VST_SRC_BASE}/audioeffectx.cpp \
-	${VST_SRC_BASE}/audioeffect.cpp \
-	${VST_SRC_BASE}/vstplugmain.cpp
-
 drumgizmo_vst_la_CXXFLAGS = -DVST \
 	-I$(top_srcdir)/plugin/plugingizmo $(DRUMGIZMO_CPPFLAGS) \
-	$(PLUGIN_GUI_CPPFLAGS) $(VST_CPPFLAGS)
+	$(PLUGIN_GUI_CPPFLAGS) $(VST_CPPFLAGS) -Ivst
 
 drumgizmo_vst_la_SOURCES = \
 	$(DRUMGIZMO_SOURCES) \
@@ -58,7 +49,7 @@ drumgizmo_vst_la_SOURCES = \
 	drumgizmo_plugin.cc
 
 drumgizmo_vst_la_LDFLAGS = -shared -module -avoid-version
-drumgizmo_vst_la_LIBADD = libvstsdk.la $(PLUGIN_GUI_LIBS) $(DRUMGIZMO_LIBS)
+drumgizmo_vst_la_LIBADD = vst/libvstsdk.la $(PLUGIN_GUI_LIBS) $(DRUMGIZMO_LIBS)
 
 
 install-exec-hook:
diff --git a/plugin/vst/Makefile.am b/plugin/vst/Makefile.am
new file mode 100644
index 0000000..489fd13
--- /dev/null
+++ b/plugin/vst/Makefile.am
@@ -0,0 +1,60 @@
+if ENABLE_VST
+noinst_LTLIBRARIES = libvstsdk.la
+endif
+
+# Targets to copy vst source files
+pluginterfaces/vst2.x:
+	$(MKDIR_P) pluginterfaces/vst2.x
+
+pluginterfaces/vst2.x/aeffect.h: pluginterfaces/vst2.x @VST_SOURCE_PATH@/pluginterfaces/vst2.x/aeffect.h
+	cp @VST_SOURCE_PATH@/pluginterfaces/vst2.x/aeffect.h $@
+
+pluginterfaces/vst2.x/aeffectx.h: pluginterfaces/vst2.x @VST_SOURCE_PATH@/pluginterfaces/vst2.x/aeffectx.h
+	cp @VST_SOURCE_PATH@/pluginterfaces/vst2.x/aeffectx.h $@
+
+#pluginterfaces/vst2.x/vstfxstore.h: pluginterfaces/vst2.x @VST_SOURCE_PATH@/pluginterfaces/vst2.x/vstfxstore.h
+#	cp @VST_SOURCE_PATH@/pluginterfaces/vst2.x/vstfxstore.h $@
+
+public.sdk/source/vst2.x:
+	$(MKDIR_P) public.sdk/source/vst2.x
+
+public.sdk/source/vst2.x/audioeffectx.h: public.sdk/source/vst2.x public.sdk/source/vst2.x/audioeffect.h pluginterfaces/vst2.x/aeffect.h @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffectx.h
+	cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffectx.h $@
+
+public.sdk/source/vst2.x/audioeffectx.cpp: public.sdk/source/vst2.x public.sdk/source/vst2.x/aeffeditor.h pluginterfaces/vst2.x/aeffectx.h public.sdk/source/vst2.x/audioeffectx.h @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffectx.cpp
+	cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffectx.cpp $@
+
+public.sdk/source/vst2.x/audioeffect.h: public.sdk/source/vst2.x @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffect.h
+	cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffect.h $@
+
+public.sdk/source/vst2.x/audioeffect.cpp: public.sdk/source/vst2.x public.sdk/source/vst2.x/audioeffect.h @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffect.cpp
+	cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/audioeffect.cpp $@
+
+public.sdk/source/vst2.x/aeffeditor.h: public.sdk/source/vst2.x @VST_SOURCE_PATH@/public.sdk/source/vst2.x/aeffeditor.h
+	cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/aeffeditor.h $@
+
+public.sdk/source/vst2.x/vstplugmain.cpp: public.sdk/source/vst2.x @VST_SOURCE_PATH@/public.sdk/source/vst2.x/vstplugmain.cpp
+	cp @VST_SOURCE_PATH@/public.sdk/source/vst2.x/vstplugmain.cpp $@
+
+# Hack to compile vst sources without -Wall -Werror
+libvstsdk_la_CXXFLAGS = -w $(VST_CPPFLAGS) -Ipublic.sdk/source/vst2.x -I.
+
+nodist_libvstsdk_la_SOURCES = \
+	public.sdk/source/vst2.x/audioeffectx.cpp \
+	public.sdk/source/vst2.x/audioeffect.cpp \
+	public.sdk/source/vst2.x/vstplugmain.cpp
+
+CLEANFILES = \
+	pluginterfaces/vst2.x/aeffect.h \
+	pluginterfaces/vst2.x/aeffectx.h \
+	public.sdk/source/vst2.x/audioeffectx.h \
+	public.sdk/source/vst2.x/audioeffectx.cpp \
+	public.sdk/source/vst2.x/audioeffect.h \
+	public.sdk/source/vst2.x/audioeffect.cpp \
+	public.sdk/source/vst2.x/aeffeditor.h \
+	public.sdk/source/vst2.x/vstplugmain.cpp
+
+clean-local:
+	-rm -rf public.sdk pluginterfaces
+
+#pluginterfaces/vst2.x/vstfxstore.h
\ No newline at end of file