From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Mon, 27 May 2013 22:33:38 +0000 (+0000)
Subject: first pass at building with hamlib, but cantget hamlib to build
X-Git-Url: http://git.whiteaudio.com/gitweb/?a=commitdiff_plain;h=60013534264c8cd8973c5fccd2bcbd704086ee81;p=freetel-svn-tracking.git

first pass at building with hamlib, but cantget hamlib to build

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

diff --git a/fdmdv2/README.Win32 b/fdmdv2/README.Win32
index 14c51811..21939e73 100644
--- a/fdmdv2/README.Win32
+++ b/fdmdv2/README.Win32
@@ -38,26 +38,33 @@ Many variations are possible.
    ./configure && make && make install
 
 6. libsamplerate:
-   download lastest source tar ball:
+   download latest source tar ball:
        http://www.mega-nerd.com/SRC/libsamplerate-0.1.8.tar.gz(not Win32 binaries)
    ./configure && make && make install
 
-7. libctb (Communications Toolbox):
+7. libtool & hamlib
 
-$ wget https://iftools.com/download/ctb/0.16/libctb-0.16.tar.gz
-$ tar xvzf libctb-0.16.tar.gz
-$ cd libctb-0.16/build
-$ mingw32-make -f makefile.gcc DEBUG=0 GPIB=0
+   $ wget http://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz
+   $ tar xvzf libtool-2.4.tar.gz
+   $ cd libtool-2.4
+   $ make && make install
 
-8. sox (usd for Filter - EQ)
+   $ wget https://downloads.sourceforge.net/project/hamlib/hamlib/1.2.15.3/hamlib-1.2.15.3.tar.gz
+   $ tar xvzf hamlib-1.2.15.3.tar.gz
+   $ cd hamlib-1.2.15.3
+   $ CFLAGS=-I/usr/local/include ./configure
+   $ libtoolize --ltdl
+   $ cd libltdl; ./configure --host=i586-mingw32msvc && make
+   $ make && make install
 
-$ 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
+8. sox (used for Filter - EQ)
 
-I couldn't find an install command line that worked, so manually copied the libs and include files.
+   $ wget http://sourceforge.net/projects/sox/files/sox/14.4.0/sox-14.4.0.tar.gz
+   $ 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.
 
 9. Codec 2
    $ wget https://freetel.svn.sourceforge.net/svnroot/freetel/codec2-dev
@@ -65,6 +72,6 @@ I couldn't find an install command line that worked, so manually copied the libs
    $ ./configure && make
 
 10. svn co fdmdv2
-   cd fdmdv2/src
-   make -f Makefile.Win32
+    cd fdmdv2/src
+    make -f Makefile.Win32
 
diff --git a/fdmdv2/src/Makefile.win32 b/fdmdv2/src/Makefile.win32
index 2068e4d5..d183b1f7 100644
--- a/fdmdv2/src/Makefile.win32
+++ b/fdmdv2/src/Makefile.win32
@@ -15,7 +15,7 @@ SVN_REVISION=$(shell svnversion)
 CODEC2_INC=$(CODEC2_PATH)/src 
 CODEC2_LIB=$(CODEC2_PATH)/src/.libs/libcodec2.a
 
-CPP_FLAGS = -D_NO_AUTOTOOLS_ -I$(INCLUDE_PATH) $(WX_CPPFLAGS) -I$(CODEC2_INC) -I../extern/include -g -Wall -DSVN_REVISION=\"$(SVN_REVISION)\"
+CPP_FLAGS = -D_NO_AUTOTOOLS_ -I$(INCLUDE_PATH) $(WX_CPPFLAGS) -I$(CODEC2_INC) -I../extern/include -I. -g -Wall -DSVN_REVISION=\"$(SVN_REVISION)\"
 LIBS = $(WX_LIBS) $(CODEC2_LIB) -lm -lportaudiocpp -lportaudio -lpthread -lsndfile -lsamplerate -lhamlib -lsox
 
 OBJS = topFrame.o \