From 0894c93aa851826b712c51a36d2390fe030d1073 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 5 Jun 2014 18:53:20 +0200 Subject: Experimentally add VST to autotools (probably highly broken) --- configure.ac | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c3fc352..997d140 100644 --- a/configure.ac +++ b/configure.ac @@ -120,23 +120,19 @@ else fi AM_CONDITIONAL([ENABLE_LV2], [test "x$enable_lv2" = "xyes"]) -#dnl ====================== -#dnl Compile VST plugin -#dnl ====================== -#AC_ARG_ENABLE([vst], -#[ --enable-vst Compile the VST plugin [default=yes]],, -# [enable_vst="yes"]) -#if test "x$enable_vst" = "xyes"; then -# enable_vst=yes -# dnl ====================== -# dnl Check for vstcore -# dnl ====================== -# PKG_CHECK_MODULES(VST, vstcore >= 4.1) -#else -# AC_MSG_RESULT([*** VST plugin will not be compiled ***]) -# enable_vst=no -#fi -#AM_CONDITIONAL([ENABLE_VST], [test "x$enable_vst" = "xyes"]) +dnl ====================== +dnl Compile VST plugin +dnl ====================== +AC_ARG_ENABLE([vst], +[ --enable-vst Compile the VST plugin [default=yes]],, + [enable_vst="yes"]) +if test "x$enable_vst" = "xyes"; then + enable_vst=yes +else + AC_MSG_RESULT([*** VST plugin will not be compiled ***]) + enable_vst=no +fi +AM_CONDITIONAL([ENABLE_VST], [test "x$enable_vst" = "xyes"]) dnl ====================== dnl Compile AU plugin -- cgit v1.2.3 From 0037fb60c257502e9589668453682816f7139f75 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 5 Jun 2014 20:04:38 +0200 Subject: Don't build LV2 and VST as default. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 997d140..d47159f 100644 --- a/configure.ac +++ b/configure.ac @@ -108,7 +108,7 @@ dnl ====================== AC_ARG_ENABLE([lv2], [ --enable-lv2 Compile the LV2 plugin [default=yes]],, [enable_lv2="yes"]) -if test "x$enable_lv2" = "xyes"; then +if test "x$enable_lv2" = "xno"; then enable_lv2=yes dnl ====================== dnl Check for lv2core @@ -125,7 +125,7 @@ dnl Compile VST plugin dnl ====================== AC_ARG_ENABLE([vst], [ --enable-vst Compile the VST plugin [default=yes]],, - [enable_vst="yes"]) + [enable_vst="no"]) if test "x$enable_vst" = "xyes"; then enable_vst=yes else -- cgit v1.2.3 From fdef2ab3e87afe8857ea7485a91c25d8727e6b7e Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 7 Jun 2014 11:51:19 +0200 Subject: Fix default LV2 compilation. --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index d47159f..47d8b1e 100644 --- a/configure.ac +++ b/configure.ac @@ -106,9 +106,9 @@ dnl ====================== dnl Compile LV2 plugin dnl ====================== AC_ARG_ENABLE([lv2], -[ --enable-lv2 Compile the LV2 plugin [default=yes]],, - [enable_lv2="yes"]) -if test "x$enable_lv2" = "xno"; then +[ --enable-lv2 Compile the LV2 plugin [default=no]],, + [enable_lv2="no"]) +if test "x$enable_lv2" = "xyes"; then enable_lv2=yes dnl ====================== dnl Check for lv2core @@ -124,7 +124,7 @@ dnl ====================== dnl Compile VST plugin dnl ====================== AC_ARG_ENABLE([vst], -[ --enable-vst Compile the VST plugin [default=yes]],, +[ --enable-vst Compile the VST plugin [default=no]],, [enable_vst="no"]) if test "x$enable_vst" = "xyes"; then enable_vst=yes -- cgit v1.2.3 From d76e2ed2483aff0c246a729c242c4c57b48d8996 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 7 Jun 2014 12:23:32 +0200 Subject: Set VST path --- configure.ac | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 47d8b1e..ef867e5 100644 --- a/configure.ac +++ b/configure.ac @@ -123,17 +123,23 @@ AM_CONDITIONAL([ENABLE_LV2], [test "x$enable_lv2" = "xyes"]) dnl ====================== dnl Compile VST plugin dnl ====================== +AC_ARG_WITH(vst_sources, [ --with-vst-sources Point this to the vstsdk24 directory]) AC_ARG_ENABLE([vst], [ --enable-vst Compile the VST plugin [default=no]],, [enable_vst="no"]) if test "x$enable_vst" = "xyes"; then - enable_vst=yes + enable_vst=yes + VST_CPPFLAGS="-I$with_vst_sources" + VST_SOURCE_PATH="$with_vst_sources" + AC_SUBST(VST_SOURCE_PATH) + AC_SUBST(VST_CPPFLAGS) else AC_MSG_RESULT([*** VST plugin will not be compiled ***]) enable_vst=no fi AM_CONDITIONAL([ENABLE_VST], [test "x$enable_vst" = "xyes"]) + dnl ====================== dnl Compile AU plugin dnl ====================== -- cgit v1.2.3 From a52c5169c4c0f8f6054b5b9da1566f0fe705b491 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 7 Jun 2014 12:55:26 +0200 Subject: VST type hack. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ef867e5..ed63b5b 100644 --- a/configure.ac +++ b/configure.ac @@ -129,7 +129,7 @@ AC_ARG_ENABLE([vst], [enable_vst="no"]) if test "x$enable_vst" = "xyes"; then enable_vst=yes - VST_CPPFLAGS="-I$with_vst_sources" + 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) -- cgit v1.2.3 From 2ce9207e277cf5c4d226b452354e085c66c4ee9c Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 17 Jul 2014 09:04:49 +0200 Subject: Add custom CFLAGS/LDFLAGS to eXpat detection. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ed63b5b..040f6e6 100644 --- a/configure.ac +++ b/configure.ac @@ -399,8 +399,8 @@ tmp_LDFLAGS="$LDFLAGS" tmp_LIBS="$LIBS" CXXFLAGS="" CPPFLAGS="" -CFLAGS="" -LDFLAGS="" +CFLAGS="EXPAT_CFLAGS" +LDFLAGS="EXPAT_LIBS" LIBS="" AC_CHECK_HEADER(expat.h, , AC_MSG_ERROR([*** eXpat header file not found!])) AC_CHECK_LIB(expat, XML_ParserCreate, , AC_MSG_ERROR([*** eXpat library not found!])) -- cgit v1.2.3 From 704266e2a046c457ac64ec98be0b7c49648092b6 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Thu, 17 Jul 2014 09:07:06 +0200 Subject: Add custom CFLAGS/LDFLAGS to eXpat detection. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 040f6e6..fe08097 100644 --- a/configure.ac +++ b/configure.ac @@ -399,8 +399,8 @@ tmp_LDFLAGS="$LDFLAGS" tmp_LIBS="$LIBS" CXXFLAGS="" CPPFLAGS="" -CFLAGS="EXPAT_CFLAGS" -LDFLAGS="EXPAT_LIBS" +CFLAGS="$EXPAT_CFLAGS" +LDFLAGS="$EXPAT_LDFLAGS" LIBS="" AC_CHECK_HEADER(expat.h, , AC_MSG_ERROR([*** eXpat header file not found!])) AC_CHECK_LIB(expat, XML_ParserCreate, , AC_MSG_ERROR([*** eXpat library not found!])) -- cgit v1.2.3 From c94d8ca185df26f531854d65c2de6eaf8a0c3ee6 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Fri, 18 Jul 2014 13:19:33 +0200 Subject: Generate VST mingw32 Makefile. --- configure.ac | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index fe08097..9928ccf 100644 --- a/configure.ac +++ b/configure.ac @@ -133,6 +133,7 @@ if test "x$enable_vst" = "xyes"; then VST_SOURCE_PATH="$with_vst_sources" AC_SUBST(VST_SOURCE_PATH) AC_SUBST(VST_CPPFLAGS) + AC_CONFIG_FILES(vst/Makefile.mingw32) else AC_MSG_RESULT([*** VST plugin will not be compiled ***]) enable_vst=no -- cgit v1.2.3 From 783f137e371a8487a3f9256f4e0b36b9be465c9c Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Mon, 8 Sep 2014 20:55:30 +0200 Subject: Moved dgedit to it's own project at http://git.drumgizmo.org/dgedit.git --- configure.ac | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 9928ccf..8900d50 100644 --- a/configure.ac +++ b/configure.ac @@ -312,38 +312,6 @@ AM_CONDITIONAL([HAVE_OUTPUT_WAVFILE], [test "x$have_output_wavfile" = "xyes"]) AM_CONDITIONAL([HAVE_OUTPUT_JACKAUDIO], [test "x$have_output_jackaudio" = "xyes"]) -AC_ARG_ENABLE([editor], -[ --disable-editor Disable Qt editor [default=enabled]],, - [enable_editor="yes"]) -if test "x$enable_editor" = "xyes"; then - have_editor=yes - dnl ====================== - dnl Check for Qt - dnl ====================== - PKG_CHECK_MODULES(QT, QtCore QtGui QtXml >= 4.5) - AC_CHECK_PROGS(QT_MOC, [moc4 moc-qt4 moc], []) - AC_CHECK_PROGS(QT_RCC, [rcc4 rcc-qt4 rcc], []) - AC_CHECK_PROGS(QT_UIC, [uic4 uic-qt4 uic], []) - if (test "$QT_MOC" = ""); then - AC_MSG_ERROR([QT4 moc is required.]) - fi - if (test "$QT_RCC" = ""); then - AC_MSG_ERROR([QT4 rcc is required.]) - fi - if (test "$QT_UIC" = ""); then - AC_MSG_ERROR([QT4 uic is required.]) - fi - - dnl ====================== - dnl Check for libao - dnl ====================== - PKG_CHECK_MODULES(AO, ao >= 0.8.8) -else - AC_MSG_RESULT([*** Qt Drumkit Editor disabled per user request ***]) - have_editor=no -fi -AM_CONDITIONAL([HAVE_EDITOR], [test "x$have_editor" = "xyes"]) - dnl ====================== dnl Check for sndfile dnl ====================== @@ -502,6 +470,4 @@ AC_OUTPUT( drumgizmo/output/dummy/Makefile drumgizmo/output/alsa/Makefile drumgizmo/output/jackaudio/Makefile - drumgizmo/output/wavfile/Makefile - dgedit/Makefile - dgedit/icons/Makefile) + drumgizmo/output/wavfile/Makefile) -- cgit v1.2.3