From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Sat, 1 Dec 2012 06:07:39 +0000 (+0000)
Subject: instructions for building sox on Win32 and modified win32 makefile for sox
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=7ec036c55c1f368931d854cd2528d059ea411e1b;p=freetel-svn-tracking.git

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