managedto get Win32 building with hamlib win32 binaries instead of building hamlib...

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

diff --git a/fdmdv2/README.Win32 b/fdmdv2/README.Win32
index 21939e73419b3a9915a8eaaefdec5fb36a87d6cf..7a40e6da34753fb2241b39dc4a4bee4af6ffb347 100644 (file)
--- a/fdmdv2/README.Win32
+++ b/fdmdv2/README.Win32
@@ -42,20 +42,16 @@ Many variations are possible.
        http://www.mega-nerd.com/SRC/libsamplerate-0.1.8.tar.gz(not Win32 binaries)\r
    ./configure && make && make install\r
 \r
-7. libtool & hamlib\r
+7. hamlib\r
 \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
+   I couldn't get this to compile from source, so used the pre-built Win32\r
+   DLLs:\r
 \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
+   Download https://downloads.sourceforge.net/project/hamlib/hamlib/1.2.15.3/hamlib-win32-1.2.15.3.zip\r
+   Open hamlib-win32-1.2.15.3.zip with a GUI archive tool\r
+   Copy hamlib/include/* to /usr/local/include\r
+   Copy hamlib/bin/hamlib*.dll to /usr/local/lib\r
+   Copy hamlib/lib/gcc to /usr/local/lib\r
 \r
 8. sox (used for Filter - EQ)\r
 \r

diff --git a/fdmdv2/src/Makefile.win32 b/fdmdv2/src/Makefile.win32
index d183b1f7b33573a28f5ee665af6ef51f5cd16f42..0bdb703ea11ab59e062d789c50010274ebde6c78 100644 (file)
--- a/fdmdv2/src/Makefile.win32
+++ b/fdmdv2/src/Makefile.win32
@@ -27,15 +27,15 @@ fdmdv2_plot_spectrum.o \
 fdmdv2_plot_waterfall_linux.o \
 fdmdv2_pa_wrapper.o \
 dlg_audiooptions.o \
-dlg_comports.o \
+dlg_ptt.o \
+dlg_options.o \
 dlg_filter.o \
 varicode.o \
 sox_biquad.o \
 hamlib.o \
 ../../codec2-dev/src/golay23.o
 
-HDRS = ../version.h 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 ../../codec2-dev/src/golay23.h hamlib.h
-
+HDRS = version.h dlg_audiooptions.h dlg_ptt.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 ../../codec2-dev/src/golay23.h hamlib.h
 
 all: freedv
 

diff --git a/fdmdv2/src/dlg_ptt.cpp b/fdmdv2/src/dlg_ptt.cpp
index fab263c2423985678112886882a57a1e6f6d8aa2..8fd9bdf32d172801df2495e8393c3851baf1281c 100644 (file)
--- a/fdmdv2/src/dlg_ptt.cpp
+++ b/fdmdv2/src/dlg_ptt.cpp
@@ -125,7 +125,7 @@ void ComPortsDlg::OnInitDialog(wxInitDialogEvent& event)
 //-------------------------------------------------------------------------
 void ComPortsDlg::populatePortList()
 {
-#ifdef __WXMSW__
+#ifdef __NOTUSED__
     m_listCtrlPorts->Clear();
     wxArrayString aStr;
     wxRegKey key(wxRegKey::HKLM, _T("HARDWARE\\DEVICEMAP\\SERIALCOMM"));