Build cleanup and windows build add.

6 files changed, 104 insertions, 39 deletions

diff --git a/configure.ac b/configure.ac
index cf3d32e..1745714 100644
--- a/configure.ac
+++ b/configure.ac
@@ -106,23 +106,23 @@ AS_IF(
   dnl ======================
   PKG_CHECK_MODULES(X11, x11 >= 1.0)
 
-  GUI_CFLAGS="-DX11 $X11_CFLAGS"
+  GUI_CPPFLAGS="-DX11 $X11_CFLAGS"
   GUI_LIBS="$X11_LIBS"],
 
   [test "x$enable_gui" = "xwin32"],
   [AC_MSG_RESULT([Setting gui backend to Win32])
-  GUI_CFLAGS="-DWIN32"
+  GUI_CPPFLAGS="-DWIN32"
   GUI_LIBS="-lgdi32 -lsetupapi -lws2_32"],
 
   [test "x$enable_gui" = "xpugl"],
   [AC_MSG_RESULT([Setting gui backend to Pugl])
-  GUI_CFLAGS="-DPUGL -I../../pugl"
+  GUI_CPPFLAGS="-DPUGL -I../../pugl"
   GUI_LIBS="-lGLU -lGL -lglut"],
 
   AC_MSG_ERROR([*** No GUI backend has been selected ***])
 )
 
-AC_SUBST(GUI_CFLAGS)
+AC_SUBST(GUI_CPPFLAGS)
 AC_SUBST(GUI_LIBS)
 
 AM_CONDITIONAL([ENABLE_PUGL], [test "x$enable_gui" = "xpugl"])
@@ -177,7 +177,7 @@ AS_IF(
   VST_SOURCE_PATH="$with_vst_sources"
   AC_SUBST(VST_SOURCE_PATH)
   AC_SUBST(VST_CPPFLAGS)
-  AC_CONFIG_FILES(vst/Makefile.mingw32)],
+  AC_CONFIG_FILES(plugin/Makefile.mingw32)],
 
   [AC_MSG_RESULT([*** VST plugin will not be compiled ***])
    enable_vst=no]
diff --git a/plugin/Makefile.am b/plugin/Makefile.am
index 4b6ee37..1dab326 100644
--- a/plugin/Makefile.am
+++ b/plugin/Makefile.am
@@ -1,6 +1,7 @@
 include $(top_srcdir)/plugingui/Makefile.am.plugingui
 include $(top_srcdir)/src/Makefile.am.drumgizmo
 
+
 #######
 # LV2
 ###
@@ -11,13 +12,8 @@ lv2plugin_DATA = manifest.ttl drumgizmo.ttl
 endif
 
 drumgizmo_la_CXXFLAGS = -DLV2 -DLV2_PLUGIN_URI=\"http://drumgizmo.org/lv2\" \
-	-I$(top_srcdir)/plugin/plugingizmo \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/plugingui \
-	-I$(top_srcdir)/include $(SNDFILE_CXXFLAGS) \
-	$(PTHREAD_CFLAGS) $(EXPAT_CFLAGS)  \
-	$(PLUGIN_GUI_CFLAGS) $(SSEFLAGS) $(ZITA_CPPFLAGS) \
-	$(SAMPLERATE_CFLAGS)
+	-I$(top_srcdir)/plugin/plugingizmo $(DRUMGIZMO_CPPFLAGS) \
+	$(PLUGIN_GUI_CPPFLAGS)
 
 drumgizmo_la_SOURCES = \
 	$(DRUMGIZMO_SOURCES) \
@@ -26,7 +22,7 @@ drumgizmo_la_SOURCES = \
 	$(top_srcdir)/plugin/plugingizmo/pluginlv2.cc \
 	drumgizmo_plugin.cc
 
-drumgizmo_la_LDFLAGS = -module -avoid-version
+drumgizmo_la_LDFLAGS = -shared -module -avoid-version
 drumgizmo_la_LIBADD = $(LV2_LIBS) $(PLUGIN_GUI_LIBS) $(DRUMGIZMO_LIBS)
 
 
@@ -34,26 +30,25 @@ drumgizmo_la_LIBADD = $(LV2_LIBS) $(PLUGIN_GUI_LIBS) $(DRUMGIZMO_LIBS)
 # VST
 ###
 if ENABLE_VST
-vstplugindir = $(prefix)/lib/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
-nodist_drumgizmo_vst_la_SOURCES = \
+# Hack to compile vst sources without -Wall -Werror
+libvstsdk_la_CXXFLAGS = -w $(VST_CPPFLAGS)
+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 \
-	-I$(top_srcdir)/src -I$(top_srcdir)/plugingui \
-	-I$(top_srcdir)/include $(SNDFILE_CXXFLAGS) \
-	$(EXPAT_CFLAGS) $(VST_CPPFLAGS) \
-	$(PLUGIN_GUI_CFLAGS) $(SSEFLAGS)\
-	$(SAMPLERATE_CFLAGS)
+	-I$(top_srcdir)/plugin/plugingizmo $(DRUMGIZMO_CPPFLAGS) \
+	$(PLUGIN_GUI_CPPFLAGS) $(VST_CPPFLAGS)
 
 drumgizmo_vst_la_SOURCES = \
 	$(DRUMGIZMO_SOURCES) \
@@ -63,12 +58,12 @@ drumgizmo_vst_la_SOURCES = \
 	drumgizmo_plugin.cc
 
 drumgizmo_vst_la_LDFLAGS = -shared -module -avoid-version
-drumgizmo_vst_la_LIBADD = $(PLUGIN_GUI_LIBS) $(DRUMGIZMO_LIBS)
-
-
-
+drumgizmo_vst_la_LIBADD = libvstsdk.la $(PLUGIN_GUI_LIBS) $(DRUMGIZMO_LIBS)
 
 
+install-exec-hook:
+	rm -f $(DESTDIR)$(libdir)/lv2/drumgizmo.lv2/drumgizmo.la
+	rm -f $(DESTDIR)$(libdir)/vst/drumgizmo_vst.la
 
 
 EXTRA_DIST = \
diff --git a/plugin/Makefile.mingw32.in b/plugin/Makefile.mingw32.in
new file mode 100644
index 0000000..4fffb3f
--- /dev/null
+++ b/plugin/Makefile.mingw32.in
@@ -0,0 +1,55 @@
+# -*- Makefile -*-
+
+include $(top_srcdir)/plugingui/Makefile.am.plugingui
+include $(top_srcdir)/src/Makefile.am.drumgizmo
+
+VST_BASE=@VST_SOURCE_PATH@
+VST_SRC_BASE = ${VST_BASE}/public.sdk/source/vst2.x/
+VST_SRC = \
+	${VST_SRC_BASE}/audioeffectx.cpp \
+	${VST_SRC_BASE}/audioeffect.cpp \
+	${VST_SRC_BASE}/vstplugmain.cpp
+VST_CPPFLAGS=-I$(VST_BASE)
+
+
+DBG_SRC = \
+	@top_srcdir@/hugin/hugin.c \
+	@top_srcdir@/hugin/hugin_syslog.c
+
+DBG_CFLAGS=-I../hugin -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX
+# -DDISABLE_HUGIN
+
+EXPAT_CFLAGS=@EXPAT_CFLAGS@
+EXPAT_LIBS=@EXPAT_LIBS@
+
+SNDFILE_CFLAGS=@SNDFILE_CFLAGS@
+SNDFILE_LIBS=@SNDFILE_LIBS@
+
+SRC_CFLAGS=@SAMPLERATE_CFLAGS@
+SRC_LIBS=@SAMPLERATE_LIBS@
+
+ZITA_CXXFLAGS=@ZITA_CPPFLAGS@
+ZITA_LIBS=@ZITA_LIBS@
+
+SRC = \
+	$(VST_SRC) \
+	$(DRUMGIZMO_SOURCES) \
+	$(PLUGIN_GUI_SOURCES) \
+	$(top_srcdir)/plugin/plugingizmo/midievent.cc \
+	$(top_srcdir)/plugin/plugingizmo/pluginvst.cc \
+	drumgizmo_plugin.cc
+
+all:
+	gcc $(DBG_CFLAGS) @top_srcdir@/hugin/hugin.c -c
+	gcc $(DBG_CFLAGS) @top_srcdir@/hugin/hugin_syslog.c -c
+	g++ $(CXXFLAGS) -std=c++11 -static -static-libgcc -O2 -g -Wall \
+		$(DBG_CFLAGS) $(DRUMGIZMO_CPPFLAGS) $(DRUMGIZMO_LIBS) $(VST_CFLAGS) \
+		hugin.o hugin_syslog.o \
+		${SRC} \
+		${PLUGIN_GUI_CPPFLAGS} $(PLUGIN_GUI_LIBS)  \
+		-shared -o drumgizmo_vst.dll -Wl,--out-implib,libdrumgizmo_vst.a
+
+clean:
+	del -f drumgizmo_vst.dll libdrumgizmo_vst.a
+-I$(top_srcdir)/plugin/plugingizmo $(DRUMGIZMO_CPPFLAGS) \
+	$(PLUGIN_GUI_CPPFLAGS)
\ No newline at end of file
diff --git a/plugingui/Makefile.am.plugingui b/plugingui/Makefile.am.plugingui
index f4c0a55..b8b03be 100644
--- a/plugingui/Makefile.am.plugingui
+++ b/plugingui/Makefile.am.plugingui
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 PLUGIN_GUI_SOURCES = \
 	$(top_srcdir)/hugin/hugin.c \
 	$(top_srcdir)/hugin/hugin_syslog.c \
@@ -36,13 +38,15 @@ PLUGIN_GUI_SOURCES = \
 
 PLUGIN_GUI_LIBS = $(GUI_LIBS) $(PTHREAD_LIBS)
 
-PLUGIN_GUI_CFLAGS = $(GUI_CFLAGS) -I$(top_srcdir)/hugin \
-									-DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX $(PTHREAD_CFLAGS) \
-									-DLODEPNG_NO_COMPILE_ENCODER \
-									-DLODEPNG_NO_COMPILE_DISK \
-									-DLODEPNG_NO_COMPILE_ANCILLARY_CHUNKS \
-									-DLODEPNG_NO_COMPILE_ERROR_TEXT \
-									-DLODEPNG_NO_COMPILE_CPP
+PLUGIN_GUI_CPPFLAGS = \
+	$(GUI_CPPFLAGS) -I$(top_srcdir)/hugin \
+	-I$(top_srcdir)/plugingui \
+	-DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX $(PTHREAD_CFLAGS) \
+	-DLODEPNG_NO_COMPILE_ENCODER \
+	-DLODEPNG_NO_COMPILE_DISK \
+	-DLODEPNG_NO_COMPILE_ANCILLARY_CHUNKS \
+	-DLODEPNG_NO_COMPILE_ERROR_TEXT \
+	-DLODEPNG_NO_COMPILE_CPP
 
 if ENABLE_X11
 PLUGIN_GUI_SOURCES += $(top_srcdir)/plugingui/nativewindow_x11.cc
@@ -54,7 +58,8 @@ endif
 
 if ENABLE_PUGL
 PLUGIN_GUI_SOURCES += \
-									 $(top_srcdir)/plugingui/nativewindow_pugl.cc \
-									 $(top_srcdir)/pugl/pugl/pugl_x11.c
-PLUGIN_GUI_CFLAGS += -I$(top_srcdir)/pugl/pugl
+	$(top_srcdir)/plugingui/nativewindow_pugl.cc \
+	$(top_srcdir)/pugl/pugl/pugl_x11.c
+
+PLUGIN_GUI_CPPFLAGS += -I$(top_srcdir)/pugl/pugl
 endif
diff --git a/src/Makefile.am.drumgizmo b/src/Makefile.am.drumgizmo
index 3248702..e41bacc 100644
--- a/src/Makefile.am.drumgizmo
+++ b/src/Makefile.am.drumgizmo
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 DRUMGIZMO_SOURCES = \
 	$(top_srcdir)/src/audiocachefile.cc \
 	$(top_srcdir)/src/audiocache.cc \
@@ -33,4 +35,12 @@ DRUMGIZMO_SOURCES = \
 	$(top_srcdir)/src/velocity.cc \
 	$(top_srcdir)/src/versionstr.cc
 
-DRUMGIZMO_LIBS = $(ZITA_LIBS) $(SNDFILE_LIBS) $(EXPAT_LIBS) $(SAMPLERATE_LIBS)
+DRUMGIZMO_LIBS = \
+	$(ZITA_LIBS) $(SNDFILE_LIBS) $(EXPAT_LIBS) $(SAMPLERATE_LIBS) \
+	$(PTHREAD_LIBS)
+
+DRUMGIZMO_CPPFLAGS = \
+	-I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/hugin \
+	$(SSEFLAGS) \
+	$(ZITA_CPPFLAGS) $(SNDFILE_CXXFLAGS) $(EXPAT_CFLAGS) $(SAMPLERATE_CFLAGS) \
+	$(PTHREAD_CFLAGS)
diff --git a/test/Makefile.am b/test/Makefile.am
index 9a7fa82..6e56043 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -120,9 +120,9 @@ configfile_SOURCES = \
 
 memchecker_CXXFLAGS = -DOUTPUT=\"memchecker\" $(CPPUNIT_CFLAGS) \
 	-I$(top_srcdir)/src -I$(top_srcdir)/include \
-	-I$(top_srcdir)/hugin -DDISABLE_HUGIN
+	-I$(top_srcdir)/hugin -DDISABLE_HUGIN $(PTHREAD_CFLAGS)
 memcheckere_CFLAGS = -DDISABLE_HUGIN
-memchecker_LDFLAGS = $(CPPUNIT_LIBS) $(DRUMGIZMO_LIBS)
+memchecker_LDFLAGS = $(CPPUNIT_LIBS) $(DRUMGIZMO_LIBS) $(PTHREAD_LIBS)
 memchecker_SOURCES = \
 	$(DRUMGIZMO_SOURCES) \
 	test.cc \