diff options
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | plugingui/Makefile.am | 4 | ||||
| -rw-r--r-- | plugingui/Makefile.am.plugingui | 19 | ||||
| -rw-r--r-- | vst/Makefile.am | 5 |
4 files changed, 19 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 7934cc2..5c8c155 100644 --- a/configure.ac +++ b/configure.ac @@ -124,6 +124,8 @@ AC_SUBST(GUI_CFLAGS) AC_SUBST(GUI_LIBS) AM_CONDITIONAL([ENABLE_PUGL], [test "x$enable_gui" = "xpugl"]) +AM_CONDITIONAL([ENABLE_WIN32], [test "x$enable_gui" = "xwin32"]) +AM_CONDITIONAL([ENABLE_X11], [test "x$enable_gui" = "xx11"]) dnl ====================== dnl Compile unit tests @@ -228,7 +230,7 @@ AS_IF( [AC_MSG_RESULT([*** input dummy plugin disabled per user request ***]) have_input_dummy=no] ) - + dnl *** Test AC_ARG_ENABLE([input_test], AS_HELP_STRING([--disable-input-test], [Disable input test plugin [default=enabled]]),, diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am index 00b0881..3a2b6f6 100644 --- a/plugingui/Makefile.am +++ b/plugingui/Makefile.am @@ -1,7 +1,6 @@ noinst_PROGRAMS = plugingui rcgen include Makefile.am.plugingui -#include $(top_srcdir)/src/Makefile.am.drumgizmo plugingui_LDADD = $(SNDFILE_LIBS) $(PTHREAD_LIBS) $(EXPAT_LIBS) \ -ldl $(PLUGIN_GUI_LIBS) @@ -57,5 +56,4 @@ EXTRA_DIST = \ verticalline.h \ widget.h \ window.h \ - lodepng/lodepng.h - + lodepng/lodepng.h
\ No newline at end of file diff --git a/plugingui/Makefile.am.plugingui b/plugingui/Makefile.am.plugingui index 38855d2..3f2e15d 100644 --- a/plugingui/Makefile.am.plugingui +++ b/plugingui/Makefile.am.plugingui @@ -1,11 +1,6 @@ - -puglsources = - PLUGIN_GUI_SOURCES = \ $(top_srcdir)/hugin/hugin.c \ $(top_srcdir)/hugin/hugin_syslog.c \ - $(puglsources) \ - $(top_srcdir)/plugingui/nativewindow_x11.cc \ $(top_srcdir)/plugingui/plugingui.cc \ $(top_srcdir)/plugingui/label.cc \ $(top_srcdir)/plugingui/eventhandler.cc \ @@ -41,9 +36,21 @@ PLUGIN_GUI_LIBS = $(GUI_LIBS) $(PTHREAD_LIBS) $(ZLIB_LIBS) PLUGIN_GUI_CFLAGS = $(GUI_CFLAGS) $(ZLIB_CFLAGS) -I$(top_srcdir)/hugin \ -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX $(PTHREAD_CFLAGS) \ - -I$(top_srcdir)/pugl/pugl \ -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 +endif + +if ENABLE_WIN32 +PLUGIN_GUI_SOURCES += $(top_srcdir)/plugingui/nativewindow_win32.cc +endif + +if ENABLE_PUGL +PLUGIN_GUI_SOURCES += $(top_srcdir)/plugingui/nativewindow_pugl.cc +PLUGIN_GUI_CFLAGS += -I$(top_srcdir)/pugl/pugl +endif diff --git a/vst/Makefile.am b/vst/Makefile.am index 7bb7214..d6c5c9e 100644 --- a/vst/Makefile.am +++ b/vst/Makefile.am @@ -40,7 +40,7 @@ libdg_la_CXXFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/plugingui \ -DUSE_THREAD $(SAMPLERATE_CFLAGS) nodist_libdrumgizmo_vst_la_SOURCES = \ - $(VST_SOURCES) + $(VST_SOURCES) libdrumgizmo_vst_la_SOURCES = \ drumgizmo_vst.cc \ @@ -50,5 +50,4 @@ libdrumgizmo_vst_la_SOURCES = \ libdrumgizmo_vst_la_LDFLAGS = -no-undefined -shared libdrumgizmo_vst_la_LIBADD = libdg.la libdrumgizmo_vst_la_CXXFLAGS = -w $(VST_CPPFLAGS) \ - -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/plugingui - + -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/plugingui
\ No newline at end of file |