Update of /cvsroot/audacity/lib-src/libsamplerate/Win32
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13262/Win32
Modified Files:
Makefile.am Makefile.in Makefile.msvc config.h
Added Files:
Makefile.mingw.in libsamplerate-0.def
Removed Files:
libsamplerate.def
Log Message:
Upgrade libsamplerate to 0.1.7 release, with autotools cleanup but no actual
patches (yet)
Index: config.h
===================================================================
RCS file: /cvsroot/audacity/lib-src/libsamplerate/Win32/config.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config.h 26 Oct 2005 09:13:47 -0000 1.4
+++ config.h 14 Feb 2009 22:13:50 -0000 1.5
@@ -1,5 +1,5 @@
/*
-** Copyright (C) 2002-2004 Erik de Castro Lopo <[email protected]>
+** Copyright (C) 2002-2008 Erik de Castro Lopo <[email protected]>
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
@@ -53,12 +53,21 @@
/* Target processor clips on positive float to int conversion. */
#define CPU_CLIPS_POSITIVE 0
+/* Target processor is big endian. */
+#define CPU_IS_BIG_ENDIAN 0
+
+/* Target processor is little endian. */
+#define CPU_IS_LITTLE_ENDIAN 1
+
/* Set to 1 to enable debugging. */
#define ENABLE_DEBUG 0
/* Major version of GCC or 3 otherwise. */
/* #undef GCC_MAJOR_VERSION */
+/* Define to 1 if you have the `alarm' function. */
+/* #undef HAVE_ALARM */
+
/* Define to 1 if you have the `calloc' function. */
#define HAVE_CALLOC 1
@@ -83,9 +92,6 @@
/* Define to 1 if you have the <inttypes.h> header file. */
/* #undef HAVE_INTTYPES_H */
-/* Define to 1 if you have the `efence' library (-lefence). */
-/* #undef HAVE_LIBEFENCE */
-
/* Define to 1 if you have the `m' library (-lm). */
/* #undef HAVE_LIBM */
@@ -107,6 +113,12 @@
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
+/* Define if you have signal SIGALRM. */
+/* #undef HAVE_SIGALRM */
+
+/* Define to 1 if you have the `signal' function. */
+/* #undef HAVE_SIGNAL */
+
/* Set to 1 if you have libsndfile. */
#define HAVE_SNDFILE 1
@@ -134,6 +146,13 @@
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#define LT_OBJDIR ".libs/"
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
+
/* Set to 1 if compiling for Win32 */
#define OS_IS_WIN32 1
@@ -141,42 +160,49 @@
#define PACKAGE "libsamplerate"
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
+#define PACKAGE_BUGREPORT "[email protected]"
/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
+#define PACKAGE_NAME "libsamplerate"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
+#define PACKAGE_STRING "libsamplerate 0.1.7"
/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
+#define PACKAGE_TARNAME "libsamplerate"
/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
+#define PACKAGE_VERSION "0.1.7"
-/* The size of a `double', as computed by sizeof. */
+/* The size of `double', as computed by sizeof. */
#define SIZEOF_DOUBLE 8
-/* The size of a `float', as computed by sizeof. */
+/* The size of `float', as computed by sizeof. */
#define SIZEOF_FLOAT 4
-/* The size of a `int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
#define SIZEOF_INT 4
-/* The size of a `long', as computed by sizeof. */
+/* The size of `long', as computed by sizeof. */
#define SIZEOF_LONG 4
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.1.2"
+<<<<<<< diff from left file
+#define VERSION "0.1.4"
+
+
+
+/* Extra Win32 hacks. */
/*
-** Do not edit or modify anything in this comment block.
-** The arch-tag line is a file identity tag for the GNU Arch
-** revision control system.
-**
-** arch-tag: 7c5a8910-8149-4e89-98ce-be92835e435b
+** Microsoft's compiler still does not support the 1999 ISO C Standard
+** which includes 'inline'.
*/
+
+#define inline __inline
+========
+#define VERSION "0.1.7"
+>>>>>>> diff from right file
Index: Makefile.in
===================================================================
RCS file: /cvsroot/audacity/lib-src/libsamplerate/Win32/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.in 26 Oct 2005 09:13:47 -0000 1.3
+++ Makefile.in 14 Feb 2009 22:13:50 -0000 1.4
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.9 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -13,17 +13,11 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -35,10 +29,27 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
+build_triplet = @build@
host_triplet = @host@
+target_triplet = @target@
+subdir = Win32
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.mingw.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/M4/libtool.m4 \
+ $(top_srcdir)/M4/ltoptions.m4 $(top_srcdir)/M4/ltsugar.m4 \
+ $(top_srcdir)/M4/ltversion.m4 $(top_srcdir)/M4/lt~obsolete.m4 \
+ $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/config.h
+CONFIG_CLEAN_FILES = Makefile.mingw
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -51,44 +62,48 @@
COMPILER_IS_GCC = @COMPILER_IS_GCC@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DLLWRAP = @DLLWRAP@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-EFENCE_LIB = @EFENCE_LIB@
EGREP = @EGREP@
-ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
FFTW3_CFLAGS = @FFTW3_CFLAGS@
FFTW3_LIBS = @FFTW3_LIBS@
+FGREP = @FGREP@
GCC_MAJOR_VERSION = @GCC_MAJOR_VERSION@
+GREP = @GREP@
HAVE_FFTW3 = @HAVE_FFTW3@
HAVE_SNDFILE = @HAVE_SNDFILE@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OS_SPECIFIC_INCLUDES = @OS_SPECIFIC_INCLUDES@
OS_SPECIFIC_LINKS = @OS_SPECIFIC_LINKS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -99,6 +114,7 @@
PEXPORTS = @PEXPORTS@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHARED_VERSION_INFO = @SHARED_VERSION_INFO@
SHELL = @SHELL@
@@ -107,68 +123,95 @@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
VERSION = @VERSION@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
+mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
-subdirs = @subdirs@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-EXTRA_DIST = Makefile.msvc config.h unistd.h unistd.h libsamplerate.def
-subdir = Win32
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = Makefile.mingw
-DIST_SOURCES =
-DIST_COMMON = $(srcdir)/Makefile.in Makefile.am Makefile.mingw.in
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = Makefile.msvc config.h unistd.h unistd.h libsamplerate-0.def
all: all-am
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+ *$$dep*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+ && exit 0; \
+ exit 1;; \
+ esac; \
+ done; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Win32/Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --gnu Win32/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)
-Makefile.mingw: $(top_builddir)/config.status Makefile.mingw.in
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ @case '$?' in \
+ *config.status*) \
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+ *) \
+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe)'; \
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
$(am__depfiles_maybe);; \
+ esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure
$(CONFIG_STATUS_DEPENDENCIES)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: $(am__configure_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+Makefile.mingw: $(top_builddir)/config.status $(srcdir)/Makefile.mingw.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
mostlyclean-libtool:
@@ -176,38 +219,29 @@
clean-libtool:
-rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
tags: TAGS
TAGS:
ctags: CTAGS
CTAGS:
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed
"s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkinstalldirs) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -221,7 +255,6 @@
check-am: all-am
check: check-am
all-am: Makefile
-
installdirs:
install: install-am
install-exec: install-exec-am
@@ -242,7 +275,7 @@
clean-generic:
distclean-generic:
- -rm -f $(CONFIG_CLEAN_FILES)
+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -253,24 +286,34 @@
distclean: distclean-am
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic
dvi: dvi-am
dvi-am:
+html: html-am
+
info: info-am
info-am:
install-data-am:
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -289,17 +332,20 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
distclean distclean-generic distclean-libtool distdir dvi \
- dvi-am info info-am install install-am install-data \
- install-data-am install-exec install-exec-am install-info \
- install-info-am install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-info-am
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
--- NEW FILE: libsamplerate-0.def ---
LIBRARY libsamplerate-0.dll
EXPORTS
src_new @1
src_delete @2
src_get_name @10
src_get_description @11
src_get_version @12
src_process @20
src_reset @21
src_set_ratio @22
src_error @30
src_strerror @31
src_simple @40
src_is_valid_ratio @50
src_callback_new @60
src_callback_read @61
src_short_to_float_array @70
src_float_to_short_array @71
src_int_to_float_array @80
src_float_to_int_array @81
--- NEW FILE: Makefile.mingw.in ---
# MinGW specific Makefile for libsamplerate.
@SET_MAKE@
PROGRAMS = sndfile-resample.exe
TARGETS = libsamplerate.dll $(PROGRAMS) varispeed-play.exe samplerate.pc
AR = @AR@
CC = @CC@
CFLAGS = @CFLAGS@ -Isrc
COMPILER_IS_GCC = @COMPILER_IS_GCC@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
DLLTOOL = @DLLTOOL@
DLLWRAP = @DLLWRAP@
FFTW3_CFLAGS = @FFTW3_CFLAGS@
FFTW3_LIBS = @FFTW3_LIBS@
INSTALL = @INSTALL@
INSTALL_DATA = ${INSTALL} -m 644
install_sh = @install_sh@
LDFLAGS = @LDFLAGS@
LN_S = @LN_S@
PEXPORTS = @PEXPORTS@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
RANLIB = @RANLIB@
SNDFILE_CFLAGS = -std=c99 @SNDFILE_CFLAGS@
SNDFILE_LIBS = @SNDFILE_LIBS@
STRIP = @STRIP@
#====================================================================
# Target directories.
bindir = @bindir@
exec_prefix = @exec_prefix@
htmldocdir = @htmldocdir@
includedir = @includedir@
libdir = @libdir@
pkgconfigdir = @libdir@/pkgconfig
prefix = @prefix@
#====================================================================
# Targets
all : $(TARGETS)
clean :
rm -f $(TARGETS) *.del *.lib src/*.o tests/*.o tests/*.exe
install : $(TARGETS)
$(install_sh) -c libsamplerate.dll $(libdir)
$(install_sh) -c samplerate.pc $(pkgconfigdir)
@for prog in $(PROGRAMS); do \
echo "installing ... $$prog" ; \
$(install_sh) -c "$$prog" $(bindir) ; \
done;
$(install_sh) -c src/samplerate.h $(includedir)
uninstall :
rm -f $(libdir)/libsamplerate.dll
rm -f $(pkgconfigdir)/samplerate.pc
@for prog in $(PROGRAMS); do \
echo "removing ... $(bindir)/$$prog" ; \
rm -f $(bindir)/"$$prog" ; \
done;
rm -f $(includedir)/samplerate.h
#====================================================================
LINK_OBJS = \
src/src_linear.o \
src/src_sinc.o \
src/src_zoh.o \
src/samplerate.o
libsamplerate.dll libsamplerate.lib : $(LINK_OBJS)
$(DLLWRAP) --def Win32/libsamplerate.def $(LINK_OBJS) --output-lib
libsamplerate.lib -o libsamplerate.dll
$(STRIP) libsamplerate.dll
sndfile-resample.exe : examples/sndfile-resample.c libsamplerate.lib
$(CC) $(CFLAGS) $(SNDFILE_CFLAGS) $+ $(SNDFILE_LIBS) -o $@
varispeed-play.exe : examples/varispeed-play.c examples/audio_out.o
libsamplerate.lib
$(CC) $(CFLAGS) $(SNDFILE_CFLAGS) $+ $(SNDFILE_LIBS) -lwinmm -o $@
examples/audio_out.o : examples/audio_out.c
$(CC) $(CFLAGS) $(SNDFILE_CFLAGS) -c $+ -o $@
samplerate.pc : samplerate.pc.in config.status
@./config.status $@
config.status :
./configure
#====================================================================
# Testing programs.
TEST_PROGS = \
tests/misc_test.exe \
tests/termination_test.exe \
tests/simple_test.exe \
tests/callback_test.exe \
tests/reset_test.exe \
tests/multi_channel_test.exe \
tests/float_short_test.exe \
tests/snr_bw_test.exe
check : $(TEST_PROGS)
tests/misc_test.exe
tests/termination_test.exe
tests/simple_test.exe
tests/callback_test.exe
tests/reset_test.exe
tests/multi_channel_test.exe
tests/float_short_test.exe
tests/snr_bw_test.exe
@echo
----------------------------------------------------------------------
@echo libsamplerate passed all tests
@echo
----------------------------------------------------------------------
#====================================================================
# Test programs.
tests/misc_test.exe : tests/misc_test.c tests/util.c libsamplerate.lib
$(CC) $(CFLAGS) $+ -o $@
tests/termination_test.exe : tests/termination_test.c tests/util.c
libsamplerate.lib
$(CC) $(CFLAGS) $+ -o $@
tests/simple_test.exe : tests/simple_test.c tests/util.c libsamplerate.lib
$(CC) $(CFLAGS) $+ -o $@
tests/callback_test.exe : tests/callback_test.c tests/util.c libsamplerate.lib
$(CC) $(CFLAGS) $+ -o $@
tests/reset_test.exe : tests/reset_test.c tests/util.c libsamplerate.lib
$(CC) $(CFLAGS) $+ -o $@
tests/float_short_test.exe : tests/float_short_test.c tests/util.c
libsamplerate.lib
$(CC) $(CFLAGS) $+ -o $@
tests/multi_channel_test.exe : tests/multi_channel_test.c tests/util.c
tests/calc_snr.c libsamplerate.lib
$(CC) $(CFLAGS) $(FFTW3_CFLAGS) $+ $(FFTW3_LIBS) -o $@
tests/snr_bw_test.exe : tests/snr_bw_test.c tests/util.c tests/calc_snr.c
libsamplerate.lib
$(CC) $(CFLAGS) $(FFTW3_CFLAGS) $+ $(FFTW3_LIBS) -o $@
# End of Makefile
#====================================================================
Index: Makefile.am
===================================================================
RCS file: /cvsroot/audacity/lib-src/libsamplerate/Win32/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am 26 Oct 2005 09:13:47 -0000 1.3
+++ Makefile.am 14 Feb 2009 22:13:49 -0000 1.4
@@ -1,9 +1,2 @@
-EXTRA_DIST = Makefile.msvc config.h unistd.h unistd.h libsamplerate.def
+EXTRA_DIST = Makefile.msvc config.h unistd.h unistd.h libsamplerate-0.def
-
-## Do not edit or modify anything in this comment block.
-## The arch-tag line is a file identity tag for the GNU Arch
-## revision control system.
-##
-## arch-tag: fcba51ab-858b-462c-9954-66fee32b7f8f
-
Index: Makefile.msvc
===================================================================
RCS file: /cvsroot/audacity/lib-src/libsamplerate/Win32/Makefile.msvc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.msvc 26 Oct 2005 09:13:47 -0000 1.3
+++ Makefile.msvc 14 Feb 2009 22:13:50 -0000 1.4
@@ -1,21 +1,24 @@
# Set the value of $(MSVCDir) for your installation.
-MSVCDir="C:\Progra~1\Micros~1\VC98"
+# MSVCDir="C:\Progra~1\Micros~1\VC98"
+# CFLAGS=/nologo /MD /W1 /GX /O2 /I "$(MSVCDir)\Include" /I . /I "Win32" /I
"src" /D "WIN32" /D "_USRDLL" /YX /FD
+# PROG_LINK_FLAGS=/nologo /incremental:no /libpath:"$(MSVCDir)\Lib"
/pdb:"libsamplerate-0.pdb" /machine:I386 /exetype:dynamic
+
+MSVCDir="C:\Progra~1\Micros~1.Net\Vc7"
+CFLAGS=/nologo /MD /W1 /GX /O2 /I "$(MSVCDir)\Include" /I
"$(MSVCDir)\PlatformSDK\Include" /I . /I "Win32" /I "src" /D "WIN32" /D
"_USRDLL" /YX /FD
+PROG_LINK_FLAGS=/nologo /incremental:no /libpath:"$(MSVCDir)\Lib"
/libpath:"$(MSVCDir)\PlatformSDK\Lib" /pdb:"libsamplerate-0.pdb" /machine:I386
/exetype:dynamic
CPP=cl.exe
LINK32=link.exe
-DLL_LINK_FLAGS=/nologo /dll /incremental:no /libpath:"$(MSVCDir)\Lib"
/pdb:"libsamplerate.pdb" /implib:".\libsamplerate.lib" /machine:I386
/out:"libsamplerate.dll"
-PROG_LINK_FLAGS=/nologo /incremental:no /libpath:"$(MSVCDir)\Lib"
/pdb:"libsamplerate.pdb" /machine:I386 /exetype:dynamic
-
-CFLAGS=/nologo /MD /W1 /GX /O2 /I "$(MSVCDir)\Include" /I . /I "Win32" /I
"src" /D "WIN32" /D "_USRDLL" /YX /FD
+DLL_LINK_FLAGS=/nologo /dll /incremental:no /libpath:"$(MSVCDir)\Lib"
/pdb:"libsamplerate-0.pdb" /implib:".\libsamplerate-0.lib" /machine:I386
/out:"libsamplerate-0.dll"
#====================================================================
# Targets
-ALL : libsamplerate.dll \
+ALL : libsndfile-1.lib libsamplerate-0.dll \
".\examples\sndfile-resample.exe" \
- ".\examples\varispeed-play.exe"
+ ".\examples\varispeed-play.exe"
CLEAN :
-...@erase "src\*.obj"
@@ -29,27 +32,28 @@
".\src\src_zoh.obj" \
".\src\src_sinc.obj"
-libsamplerate.dll : $(LINK32_OBJS) ".\Win32\libsamplerate.def"
- $(LINK32) $(DLL_LINK_FLAGS) /def:".\Win32\libsamplerate.def" $(LINK32_OBJS)
+libsamplerate-0.dll : $(LINK32_OBJS) ".\Win32\libsamplerate-0.def"
+ $(LINK32) $(DLL_LINK_FLAGS) /def:".\Win32\libsamplerate-0.def"
$(LINK32_OBJS)
".\examples\sndfile-resample.exe" : ".\examples\sndfile-resample.c"
$(CPP) $(CFLAGS) /Fo".\examples\sndfile-resample.obj" /c
".\examples\sndfile-resample.c"
- $(LINK32) $(PROG_LINK_FLAGS) /out:".\examples\sndfile-resample.exe"
".\examples\sndfile-resample.obj" libsamplerate.lib libsndfile.lib
+ $(LINK32) $(PROG_LINK_FLAGS) /out:".\examples\sndfile-resample.exe"
".\examples\sndfile-resample.obj" libsamplerate-0.lib libsndfile-1.lib
".\examples\varispeed-play.exe" : ".\examples\varispeed-play.c"
".\examples\audio_out.obj"
$(CPP) $(CFLAGS) /Fo".\examples\varispeed-play.obj" /c
".\examples\varispeed-play.c"
- $(LINK32) $(PROG_LINK_FLAGS) /out:".\examples\varispeed-play.exe"
".\examples\varispeed-play.obj" ".\examples\audio_out.obj" libsamplerate.lib
libsndfile.lib winmm.lib
+ $(LINK32) $(PROG_LINK_FLAGS) /out:".\examples\varispeed-play.exe"
".\examples\varispeed-play.obj" ".\examples\audio_out.obj" libsamplerate-0.lib
libsndfile-1.lib winmm.lib
".\examples\audio_out.obj" : ".\examples\audio_out.c"
$(CPP) $(CFLAGS) /Fo".\examples\audio_out.obj" /c ".\examples\audio_out.c"
TEST_PROGS= \
- ".\tests\misc_test.exe" \
- ".\tests\termination_test.exe" \
- ".\tests\simple_test.exe" \
- ".\tests\reset_test.exe" \
- ".\tests\multi_channel_test.exe" \
- ".\tests\snr_bw_test.exe"
+ ".\tests\misc_test.exe" \
+ ".\tests\termination_test.exe" \
+ ".\tests\simple_test.exe" \
+ ".\tests\reset_test.exe" \
+ ".\tests\multi_channel_test.exe" \
+ ".\tests\snr_bw_test.exe" \
+ ".\tests\throughput_test.exe"
CHECK: $(TEST_PROGS)
".\tests\misc_test.exe"
@@ -58,6 +62,7 @@
".\tests\reset_test.exe"
".\tests\multi_channel_test.exe"
".\tests\snr_bw_test.exe"
+ ".\tests\throughput_test.exe"
-...@echo
----------------------------------------------------------------------
-...@echo libsamplerate passed all tests
-...@echo
----------------------------------------------------------------------
@@ -94,31 +99,52 @@
".\tests\misc_test.exe" : ".\tests\misc_test.c" ".\tests\util.obj"
$(CPP) $(CFLAGS) /Fo".\tests\misc_test.obj" /c ".\tests\misc_test.c"
- $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\misc_test.exe"
".\tests\misc_test.obj" ".\tests\util.obj" libsamplerate.lib
+ $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\misc_test.exe"
".\tests\misc_test.obj" ".\tests\util.obj" libsamplerate-0.lib
".\tests\termination_test.exe" : ".\tests\termination_test.c"
".\tests\util.obj"
$(CPP) $(CFLAGS) /Fo".\tests\termination_test.obj" /c
".\tests\termination_test.c"
- $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\termination_test.exe"
".\tests\termination_test.obj" ".\tests\util.obj" libsamplerate.lib
+ $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\termination_test.exe"
".\tests\termination_test.obj" ".\tests\util.obj" libsamplerate-0.lib
".\tests\streaming_test.exe" : ".\tests\streaming_test.c" ".\tests\util.obj"
$(CPP) $(CFLAGS) /Fo".\tests\streaming_test.obj" /c
".\tests\streaming_test.c"
- $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\streaming_test.exe"
".\tests\streaming_test.obj" ".\tests\util.obj" libsamplerate.lib
+ $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\streaming_test.exe"
".\tests\streaming_test.obj" ".\tests\util.obj" libsamplerate-0.lib
".\tests\simple_test.exe" : ".\tests\simple_test.c" ".\tests\util.obj"
$(CPP) $(CFLAGS) /Fo".\tests\simple_test.obj" /c ".\tests\simple_test.c"
- $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\simple_test.exe"
".\tests\simple_test.obj" ".\tests\util.obj" libsamplerate.lib
+ $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\simple_test.exe"
".\tests\simple_test.obj" ".\tests\util.obj" libsamplerate-0.lib
".\tests\reset_test.exe" : ".\tests\reset_test.c" ".\tests\util.obj"
$(CPP) $(CFLAGS) /Fo".\tests\reset_test.obj" /c ".\tests\reset_test.c"
- $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\reset_test.exe"
".\tests\reset_test.obj" ".\tests\util.obj" libsamplerate.lib
+ $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\reset_test.exe"
".\tests\reset_test.obj" ".\tests\util.obj" libsamplerate-0.lib
".\tests\multi_channel_test.exe" : ".\tests\multi_channel_test.c"
".\tests\util.obj" ".\tests\calc_snr.obj"
$(CPP) $(CFLAGS) /Fo".\tests\multi_channel_test.obj" /c
".\tests\multi_channel_test.c"
- $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\multi_channel_test.exe"
".\tests\multi_channel_test.obj" ".\tests\util.obj" ".\tests\calc_snr.obj"
libsamplerate.lib
+ $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\multi_channel_test.exe"
".\tests\multi_channel_test.obj" ".\tests\util.obj" ".\tests\calc_snr.obj"
libsamplerate-0.lib
".\tests\snr_bw_test.exe" : ".\tests\snr_bw_test.c" ".\tests\util.obj"
$(CPP) $(CFLAGS) /Fo".\tests\snr_bw_test.obj" /c ".\tests\snr_bw_test.c"
- $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\snr_bw_test.exe"
".\tests\snr_bw_test.obj" ".\tests\util.obj" libsamplerate.lib
+ $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\snr_bw_test.exe"
".\tests\snr_bw_test.obj" ".\tests\util.obj" libsamplerate-0.lib
+
+".\tests\throughput_test.exe" : ".\tests\throughput_test.c" ".\tests\util.obj"
+ $(CPP) $(CFLAGS) /Fo".\tests\throughput_test.obj" /c
".\tests\throughput_test.c"
+ $(LINK32) $(PROG_LINK_FLAGS) /out:".\tests\throughput_test.exe"
".\tests\throughput_test.obj" ".\tests\util.obj" libsamplerate-0.lib
+
+#====================================================================
+# Bit of extra trickery.
+
+sndfile.h libsndfile-1.dll libsndfile-1.def :
+ -...@echo
*---------------------------------------------------------------
+ -...@echo * You need to get the pre-built Win32 binaries for libsndfile
+ -...@echo * from : http://www.mega-nerd.com/libsndfile
+ -...@echo * The prebuilt binaries will be in a ZIP file which contains
+ -...@echo * the files :
+ -...@echo * sndfile.h libsndfile-1.dll libsndfile-1.def
+ -...@echo * which need to be copied to this directory.
+ -...@echo
*---------------------------------------------------------------
+ -...@exit 1
+
+libsndfile-1.lib : libsndfile-1.dll libsndfile-1.def
+ lib /machine:i386 /def:libsndfile-1.def
# End of Makefile
#====================================================================
--- libsamplerate.def DELETED ---
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
