From b0f049f861eb13c0400fe1208d80daa7e4fe5854 Mon Sep 17 00:00:00 2001 From: drowe67 Date: Mon, 27 May 2013 23:35:32 +0000 Subject: [PATCH] managedto get Win32 building with hamlib win32 binaries instead of building hamlib myself git-svn-id: https://svn.code.sf.net/p/freetel/code@1288 01035d8c-6547-0410-b346-abe4f91aad63 --- fdmdv2/README.Win32 | 20 ++++++++------------ fdmdv2/src/Makefile.win32 | 6 +++--- fdmdv2/src/dlg_ptt.cpp | 2 +- 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/fdmdv2/README.Win32 b/fdmdv2/README.Win32 index 21939e73..7a40e6da 100644 --- 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) ./configure && make && make install -7. libtool & hamlib +7. hamlib - $ 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 + I couldn't get this to compile from source, so used the pre-built Win32 + DLLs: - $ 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 + Download https://downloads.sourceforge.net/project/hamlib/hamlib/1.2.15.3/hamlib-win32-1.2.15.3.zip + Open hamlib-win32-1.2.15.3.zip with a GUI archive tool + Copy hamlib/include/* to /usr/local/include + Copy hamlib/bin/hamlib*.dll to /usr/local/lib + Copy hamlib/lib/gcc to /usr/local/lib 8. sox (used for Filter - EQ) diff --git a/fdmdv2/src/Makefile.win32 b/fdmdv2/src/Makefile.win32 index d183b1f7..0bdb703e 100644 --- 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 fab263c2..8fd9bdf3 100644 --- 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")); -- 2.25.1