From dd10c41d96a439222ae697aacb7eeba135ccd3ed Mon Sep 17 00:00:00 2001
From: drowe67 <drowe67@01035d8c-6547-0410-b346-abe4f91aad63>
Date: Wed, 9 Jul 2014 21:16:47 +0000
Subject: [PATCH] FreeDV on Win32 building using Makefile.win32

git-svn-id: https://svn.code.sf.net/p/freetel/code@1747 01035d8c-6547-0410-b346-abe4f91aad63
---
 fdmdv2-dev/README.Win32       | 5 +++--
 fdmdv2-dev/src/Makefile.win32 | 4 ++--
 fdmdv2-dev/src/dlg_options.h  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/fdmdv2-dev/README.Win32 b/fdmdv2-dev/README.Win32
index c2244a2c..0fc91828 100644
--- a/fdmdv2-dev/README.Win32
+++ b/fdmdv2-dev/README.Win32
@@ -77,12 +77,13 @@ are possible:
    $ cd codec2-dev
    $ mkdir build_win32
    $ cd build_win32
-   $ cmake -G "MSYS Makefiles" ..
+   $ cmake -DSPEEXDSP_INCLUDE_DIR=/usr/local/include/ -G "MSYS Makefiles" ..
    $ make
+   $ cp src/libcodec2.dll* /usr/local/lib
 
 11. freedv (dev version)
    $ check out fdmdv2-dev using tortise svn from:
-       wget https://freetel.svn.sourceforge.net/svnroot/freetel/fdmdv-dev
+       wget https://freetel.svn.sourceforge.net/svnroot/freetel/fdmdv2-dev
    $ cd fdmdv2-dev/src
    $ make -f Makefile.Win32
 
diff --git a/fdmdv2-dev/src/Makefile.win32 b/fdmdv2-dev/src/Makefile.win32
index 58e00d9d..809d8b1c 100644
--- a/fdmdv2-dev/src/Makefile.win32
+++ b/fdmdv2-dev/src/Makefile.win32
@@ -13,10 +13,10 @@ WX_CPPFLAGS = $(shell $(WX_CONFIG) --cxxflags) -D__WXDEBUG__
 WX_LIBS = $(shell $(WX_CONFIG) --libs core, base, aui, adv, net)
 SVN_REVISION=$(shell svnversion)
 CODEC2_INC=$(CODEC2_PATH)/src 
-CODEC2_LIB=$(CODEC2_PATH)/src/.libs/libcodec2.a
+CODEC2_LIB=$(CODEC2_PATH)/build_win32/src/
 
 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 -lctb-0.16
+LIBS = $(WX_LIBS) -L$(CODEC2_LIB) -lcodec2 -lm -lportaudiocpp -lportaudio -lpthread -lsndfile -lsamplerate -lhamlib -lsox -lspeexdsp
 
 OBJS = topFrame.o \
 fdmdv2_main.o \
diff --git a/fdmdv2-dev/src/dlg_options.h b/fdmdv2-dev/src/dlg_options.h
index bfe30d47..498804d5 100644
--- a/fdmdv2-dev/src/dlg_options.h
+++ b/fdmdv2-dev/src/dlg_options.h
@@ -33,7 +33,7 @@ class OptionsDlg : public wxDialog
     public:
     OptionsDlg( wxWindow* parent,
                wxWindowID id = wxID_ANY, const wxString& title = _("Options"), 
-                const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(600,580), 
+                const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(600,600), 
                long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
         ~OptionsDlg();
 
-- 
2.25.1