diff options
| -rw-r--r-- | AUTHORS | 0 | ||||
| -rw-r--r-- | ChangeLog | 0 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | NEWS | 0 | ||||
| -rw-r--r-- | README | 0 | ||||
| -rw-r--r-- | configure.ac | 51 | ||||
| -rw-r--r-- | plugingui/Makefile.am | 1 | ||||
| -rw-r--r-- | plugingui/Makefile.am.plugingui | 9 |
8 files changed, 27 insertions, 38 deletions
diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/ChangeLog diff --git a/Makefile.am b/Makefile.am index c8afeaf..f225c8c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = gnu -SUBDIRS = tools src lv2 -DISTDIRS = tools src lv2 +SUBDIRS = tools src plugingui +DISTDIRS = tools src plugingconui EXTRA_DIST = \ version.h
\ No newline at end of file diff --git a/configure.ac b/configure.ac index 2e3fc7c..fadf328 100644 --- a/configure.ac +++ b/configure.ac @@ -134,29 +134,29 @@ AS_IF( AM_CONDITIONAL([ENABLE_LV2], [test "x$enable_lv2" = "xyes"]) -dnl ====================== -dnl Compile VST plugin -dnl ====================== -AC_ARG_WITH([vst_sources], - AS_HELP_STRING([--with-vst-sources], [Point this to the vstsdk24 directory])) -AC_ARG_ENABLE([vst], - AS_HELP_STRING([--enable-vst], [Compile the VST plugin [default=no]]),, - [enable_vst="no"]) - -AS_IF( - [test "x$enable_vst" = "xyes"], - [enable_vst=yes - VST_CPPFLAGS="-I$with_vst_sources -D__int64='long long int'" - VST_SOURCE_PATH="$with_vst_sources" - AC_SUBST(VST_SOURCE_PATH) - AC_SUBST(VST_CPPFLAGS) - AC_CONFIG_FILES(vst/Makefile.mingw32)], - - [AC_MSG_RESULT([*** VST plugin will not be compiled ***]) - enable_vst=no] -) - -AM_CONDITIONAL([ENABLE_VST], [test "x$enable_vst" = "xyes"]) +# dnl ====================== +# dnl Compile VST plugin +# dnl ====================== +# AC_ARG_WITH([vst_sources], +# AS_HELP_STRING([--with-vst-sources], [Point this to the vstsdk24 directory])) +# AC_ARG_ENABLE([vst], +# AS_HELP_STRING([--enable-vst], [Compile the VST plugin [default=no]]),, +# [enable_vst="no"]) +# +# AS_IF( +# [test "x$enable_vst" = "xyes"], +# [enable_vst=yes +# VST_CPPFLAGS="-I$with_vst_sources -D__int64='long long int'" +# VST_SOURCE_PATH="$with_vst_sources" +# AC_SUBST(VST_SOURCE_PATH) +# AC_SUBST(VST_CPPFLAGS) +# AC_CONFIG_FILES(vst/Makefile.mingw32)], +# +# [AC_MSG_RESULT([*** VST plugin will not be compiled ***]) +# enable_vst=no] +# ) +# +# AM_CONDITIONAL([ENABLE_VST], [test "x$enable_vst" = "xyes"]) dnl ====================== @@ -242,9 +242,6 @@ AC_CONFIG_FILES( Makefile tools/Makefile src/Makefile - pluginui/Makefile - lv2/Makefile - plugingui/Makefile -) + plugingui/Makefile) AC_OUTPUT() diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am index 00b0881..e096e29 100644 --- a/plugingui/Makefile.am +++ b/plugingui/Makefile.am @@ -58,4 +58,3 @@ EXTRA_DIST = \ widget.h \ window.h \ lodepng/lodepng.h - diff --git a/plugingui/Makefile.am.plugingui b/plugingui/Makefile.am.plugingui index cb7a79f..c2fd145 100644 --- a/plugingui/Makefile.am.plugingui +++ b/plugingui/Makefile.am.plugingui @@ -1,10 +1,5 @@ -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/nativewindow_win32.cc \ $(top_srcdir)/plugingui/application.cc \ @@ -40,9 +35,7 @@ PLUGIN_GUI_SOURCES = \ 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 \ +PLUGIN_GUI_CFLAGS = $(GUI_CFLAGS) $(ZLIB_CFLAGS) $(PTHREAD_CFLAGS) \ -DLODEPNG_NO_COMPILE_ENCODER \ -DLODEPNG_NO_COMPILE_DISK \ -DLODEPNG_NO_COMPILE_ANCILLARY_CHUNKS \ |