instructions for building sox on Win32 and modified win32 makefile for sox

git-svn-id: https://svn.code.sf.net/p/freetel/code@1104 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/fdmdv2/README.Win32 b/fdmdv2/README.Win32
index 92b1fa8e9b6ada7b92c9e9f44b95bb110b221a32..5259f7547355e642b89c1857e1157a90f644c62d 100644 (file)
--- a/fdmdv2/README.Win32
+++ b/fdmdv2/README.Win32
@@ -49,9 +49,19 @@ $ tar xvzf libctb-0.16.tar.gz
 $ cd libctb-0.16/build\r
 $ mingw32-make -f makefile.gcc DEBUG=0 GPIB=0\r
 \r
+8. sox (usd for Filter - EQ)\r
+\r
+$ wget http://sourceforge.net/projects/sox/files/sox/14.4.0/sox-14.4.0.tar.gz/\r
+download\r
+$ tar xvzf sox-14.4.0.tar.gz\r
+$ ./configure --enable-shared=no --without-id3tag --without-png --disable-gomp\r
+ --with-oggvorbis=no --with-oss=no --with-flac=no --disable-dl-sndfile --with-\r
+waveaudio=no\r
+$ make && make install\r
+\r
 I couldn't find an install command line that worked, so manually copied the libs and include files.\r
 \r
-8. svn co fdmdv2\r
+9. svn co fdmdv2\r
    cd fdmdv2/src\r
    make -f Makefile.Win32\r
 \r

diff --git a/fdmdv2/src/Makefile.win32 b/fdmdv2/src/Makefile.win32
index 9b62253e57ff5508ae0ece81dc27a62da3c634ec..4b7b6df2104e9eb42aa5d0ca53b54dee8b6dbf89 100644 (file)
--- a/fdmdv2/src/Makefile.win32
+++ b/fdmdv2/src/Makefile.win32
@@ -16,7 +16,7 @@ CODEC2_INC=$(CODEC2_PATH)/src
 CODEC2_LIB=$(CODEC2_PATH)/src/.libs/libcodec2.a
 
 CPP_FLAGS = -I$(INCLUDE_PATH) $(WX_CPPFLAGS) -I$(CODEC2_INC) -I../extern/include -g -Wall -DSVN_REVISION=\"$(SVN_REVISION)\"
-LIBS = $(WX_LIBS) $(CODEC2_LIB) -lm -lportaudiocpp -lportaudio -lpthread -lsndfile -lsamplerate -lctb-0.16
+LIBS = $(WX_LIBS) $(CODEC2_LIB) -lm -lportaudiocpp -lportaudio -lpthread -lsndfile -lsamplerate -lctb-0.16 -lsox
 
 OBJS = topFrame.o \
 fdmdv2_main.o \
@@ -29,7 +29,8 @@ fdmdv2_pa_wrapper.o \
 dlg_audiooptions.o \
 dlg_comports.o \
 dlg_filter.o \
-varicode.o
+varicode.o \
+sox_biquad.o
 
 HDRS = dlg_audiooptions.h dlg_comports.h dlg_filter.h fdmdv2_main.h fdmdv2_defines.h fdmdv2_plot.h fdmdv2_plot_scalar.h fdmdv2_plot_waterfall_linux.h fdmdv2_plot_scatter.h fdmdv2_plot_spectrum.h fdmdv2_pa_wrapper.h topFrame.h dlg_audiooptions.h topFrame.h varicode.h
 
@@ -42,7 +43,7 @@ freedv: $(OBJS)
        g++ $(CPP_FLAGS) -c $< -o $@
 
 %.o: %.c $(HDRS) Makefile.win32
-       g++ $(CPP_FLAGS) -c $< -o $@
+       gcc $(CPP_FLAGS) -c $< -o $@
 
 clean:
        rm -f *.o fdmdv2