From: Luca Trisciani Date: Tue, 19 Dec 2017 23:47:35 +0000 (+0100) Subject: Some minor changes X-Git-Tag: v0.0.1~81 X-Git-Url: https://git.carlh.net/gitweb/?p=leqm-nrt.git;a=commitdiff_plain;h=8292995caa014b06a1b7d4c2db518bbf0cdf0cd7 Some minor changes --- diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 9502016..3c97687 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -34,47 +34,47 @@ 'configure.ac' ], { + 'AM_AUX_DIR_EXPAND' => 1, + '_AM_SET_OPTION' => 1, + 'm4_pattern_allow' => 1, + 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, '_AM_IF_OPTION' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - 'AM_SILENT_RULES' => 1, - '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, '_AM_DEPENDENCIES' => 1, - 'AM_SANITY_CHECK' => 1, - 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + '_AM_AUTOCONF_VERSION' => 1, + 'AM_RUN_LOG' => 1, + 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, '_AM_MANGLE_OPTION' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AM_SET_LEADING_DOT' => 1, - 'AM_AUX_DIR_EXPAND' => 1, - '_AM_SET_OPTIONS' => 1, 'AM_SET_DEPDIR' => 1, - '_AM_AUTOCONF_VERSION' => 1, + 'AM_SET_LEADING_DOT' => 1, + 'AM_PROG_CC_C_O' => 1, 'AM_MAKE_INCLUDE' => 1, - '_AM_PROG_TAR' => 1, - 'm4_include' => 1, - 'AM_INIT_AUTOMAKE' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AM_PROG_INSTALL_STRIP' => 1, '_m4_warn' => 1, - 'AC_DEFUN' => 1, - 'AC_DEFUN_ONCE' => 1, + '_AM_SET_OPTIONS' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AM_CONDITIONAL' => 1, + 'm4_include' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, 'AM_SUBST_NOTMAKE' => 1, - '_AM_PROG_CC_C_O' => 1, - 'm4_pattern_allow' => 1, + 'AM_MISSING_PROG' => 1, 'AM_PROG_INSTALL_SH' => 1, 'AU_DEFUN' => 1, - 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, - 'include' => 1, - '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AM_SILENT_RULES' => 1, + 'm4_pattern_forbid' => 1, + 'AC_DEFUN_ONCE' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, + '_AM_SUBST_NOTMAKE' => 1, 'AM_DEP_TRACK' => 1, + 'include' => 1, + '_AM_PROG_TAR' => 1, + '_AM_PROG_CC_C_O' => 1, 'AM_MISSING_HAS_RUN' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, - 'AM_MISSING_PROG' => 1, - 'm4_pattern_forbid' => 1, - 'AM_CONDITIONAL' => 1, - 'AM_PROG_INSTALL_STRIP' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - '_AM_SET_OPTION' => 1, - 'AM_RUN_LOG' => 1 + '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AC_DEFUN' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + 'AM_SANITY_CHECK' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -89,70 +89,70 @@ 'configure.ac' ], { + 'AC_FC_PP_SRCEXT' => 1, + 'sinclude' => 1, + 'AM_GNU_GETTEXT' => 1, + 'AC_CONFIG_AUX_DIR' => 1, + 'AC_CANONICAL_HOST' => 1, + 'AC_CANONICAL_TARGET' => 1, + 'LT_INIT' => 1, + 'AC_CONFIG_FILES' => 1, '_AM_MAKEFILE_INCLUDE' => 1, - 'AC_DEFINE_TRACE_LITERAL' => 1, - 'AM_PROG_FC_C_O' => 1, - 'AC_FC_FREEFORM' => 1, - 'AC_SUBST_TRACE' => 1, - 'AM_NLS' => 1, - 'AC_SUBST' => 1, 'AC_INIT' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AM_PROG_CC_C_O' => 1, - 'AC_CANONICAL_HOST' => 1, - 'AC_CONFIG_HEADERS' => 1, - 'AM_CONDITIONAL' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AC_LIBSOURCE' => 1, 'LT_SUPPORTED_TAG' => 1, + 'AM_PROG_F77_C_O' => 1, + 'AC_PREREQ' => 1, + 'AC_CHECK_FUNCS' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'AC_FC_FREEFORM' => 1, 'AC_CONFIG_SUBDIRS' => 1, - '_AM_COND_IF' => 1, - 'AC_CANONICAL_BUILD' => 1, - 'm4_sinclude' => 1, - 'AC_FC_SRCEXT' => 1, + 'm4_pattern_forbid' => 1, 'AM_INIT_AUTOMAKE' => 1, - '_AM_COND_ENDIF' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, 'AC_FUNC_MALLOC' => 1, - 'LT_INIT' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, - 'AM_PROG_MOC' => 1, - 'AH_OUTPUT' => 1, - 'AC_CHECK_HEADERS' => 1, '_AM_COND_ELSE' => 1, - 'AM_PROG_CXX_C_O' => 1, + 'AM_PROG_AR' => 1, + '_m4_warn' => 1, 'AM_XGETTEXT_OPTION' => 1, - 'AC_CONFIG_AUX_DIR' => 1, - 'include' => 1, - 'AC_CHECK_FUNCS' => 1, - 'AM_GNU_GETTEXT' => 1, - 'm4_pattern_forbid' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AH_OUTPUT' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'AM_POT_TOOLS' => 1, + 'AC_CHECK_HEADERS' => 1, 'AC_CONFIG_LINKS' => 1, - '_m4_warn' => 1, - 'AM_EXTRA_RECURSIVE_TARGETS' => 1, - 'AC_CONFIG_FILES' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_CANONICAL_SYSTEM' => 1, + 'm4_sinclude' => 1, 'm4_pattern_allow' => 1, - 'AC_FC_PP_SRCEXT' => 1, - 'AC_PREREQ' => 1, - 'AM_PROG_MKDIR_P' => 1, - 'sinclude' => 1, - 'AM_PROG_F77_C_O' => 1, + 'AM_EXTRA_RECURSIVE_TARGETS' => 1, + 'AM_MAINTAINER_MODE' => 1, 'AC_PROG_CC' => 1, - 'm4_include' => 1, - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + 'AM_PROG_FC_C_O' => 1, + 'AM_NLS' => 1, + 'AC_FC_PP_DEFINE' => 1, + 'include' => 1, + '_AM_COND_IF' => 1, + 'AC_FC_SRCEXT' => 1, + 'AC_CANONICAL_BUILD' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'AC_SUBST_TRACE' => 1, 'AC_PROG_LIBTOOL' => 1, - 'AM_ENABLE_MULTILIB' => 1, 'AM_SILENT_RULES' => 1, - 'AC_CANONICAL_TARGET' => 1, - 'AC_FC_PP_DEFINE' => 1, - 'AM_PROG_AR' => 1, - 'AM_POT_TOOLS' => 1, - 'AC_LIBSOURCE' => 1, + 'm4_include' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_CONFIG_HEADERS' => 1, + '_LT_AC_TAGCONFIG' => 1, 'AM_PATH_GUILE' => 1, - 'AM_MAINTAINER_MODE' => 1, - '_AM_SUBST_NOTMAKE' => 1 + 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, + 'AM_PROG_CXX_C_O' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AM_ENABLE_MULTILIB' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AM_PROG_MOC' => 1, + 'AM_PROG_MKDIR_P' => 1, + 'AC_SUBST' => 1, + '_AM_COND_ENDIF' => 1 } ], 'Autom4te::Request' ) ); diff --git a/src/Makefile.am b/src/Makefile.am index 3bd5867..897d2c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ bin_PROGRAMS = leqm-nrt leqm_nrt_SOURCES = leqm-nrt.c leqm_nrt_CCFLAGS = -I /usr/include/pthread -I /usr/include/sndfile -leqm_nrt_LDFLAGS = -lsndfile -lm -lpthread -lrt +leqm_nrt_LDFLAGS = -lsndfile -lm -lpthread diff --git a/src/Makefile.in b/src/Makefile.in index 3f6287e..23f98fe 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -249,7 +249,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ leqm_nrt_SOURCES = leqm-nrt.c leqm_nrt_CCFLAGS = -I /usr/include/pthread -I /usr/include/sndfile -leqm_nrt_LDFLAGS = -lsndfile -lm -lpthread -lrt +leqm_nrt_LDFLAGS = -lsndfile -lm -lpthread all: all-am .SUFFIXES: diff --git a/src/leqm-nrt.c b/src/leqm-nrt.c index 79a31b8..cec1cf0 100644 --- a/src/leqm-nrt.c +++ b/src/leqm-nrt.c @@ -34,6 +34,14 @@ #include #include +#ifdef _WIN32 +#include +#elif __APPLE__ +#include +#include