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 14c51811afdb3158de4fe85f6ebb4964e8b595d2..21939e73419b3a9915a8eaaefdec5fb36a87d6cf 100644 (file)
--- a/fdmdv2/README.Win32
+++ b/fdmdv2/README.Win32
@@ -38,26 +38,33 @@ Many variations are possible.
    ./configure && make && make install\r
 \r
 6. libsamplerate:\r
-   download lastest source tar ball:\r
+   download latest source tar ball:\r
        http://www.mega-nerd.com/SRC/libsamplerate-0.1.8.tar.gz(not Win32 binaries)\r
    ./configure && make && make install\r
 \r
-7. libctb (Communications Toolbox):\r
+7. libtool & hamlib\r
 \r
-$ wget https://iftools.com/download/ctb/0.16/libctb-0.16.tar.gz\r
-$ tar xvzf libctb-0.16.tar.gz\r
-$ cd libctb-0.16/build\r
-$ mingw32-make -f makefile.gcc DEBUG=0 GPIB=0\r
+   $ wget http://ftp.gnu.org/gnu/libtool/libtool-2.4.tar.gz\r
+   $ tar xvzf libtool-2.4.tar.gz\r
+   $ cd libtool-2.4\r
+   $ make && make install\r
 \r
-8. sox (usd for Filter - EQ)\r
+   $ wget https://downloads.sourceforge.net/project/hamlib/hamlib/1.2.15.3/hamlib-1.2.15.3.tar.gz\r
+   $ tar xvzf hamlib-1.2.15.3.tar.gz\r
+   $ cd hamlib-1.2.15.3\r
+   $ CFLAGS=-I/usr/local/include ./configure\r
+   $ libtoolize --ltdl\r
+   $ cd libltdl; ./configure --host=i586-mingw32msvc && make\r
+   $ make && make install\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 --with-oggvorbis=no --with-oss=no --with-flac=no --disable-dl-sndfile --with-waveaudio=no\r
-$ make && make install\r
+8. sox (used for Filter - EQ)\r
 \r
-I couldn't find an install command line that worked, so manually copied the libs and include files.\r
+   $ wget http://sourceforge.net/projects/sox/files/sox/14.4.0/sox-14.4.0.tar.gz\r
+   $ tar xvzf sox-14.4.0.tar.gz\r
+   $ ./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\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
 9. Codec 2\r
    $ wget https://freetel.svn.sourceforge.net/svnroot/freetel/codec2-dev\r
@@ -65,6 +72,6 @@ I couldn't find an install command line that worked, so manually copied the libs
    $ ./configure && make\r
 \r
 10. svn co fdmdv2\r
-   cd fdmdv2/src\r
-   make -f Makefile.Win32\r
+    cd fdmdv2/src\r
+    make -f Makefile.Win32\r
 \r

diff --git a/fdmdv2/src/Makefile.win32 b/fdmdv2/src/Makefile.win32
index 2068e4d5b1d5ac6999eab0f326bb64dbde25fc5f..d183b1f7b33573a28f5ee665af6ef51f5cd16f42 100644 (file)
--- 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 \