FreeDV on Win32 building using Makefile.win32

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

diff --git a/fdmdv2-dev/README.Win32 b/fdmdv2-dev/README.Win32
index c2244a2cb1d293e9f81046d7cb23f5028fea3dc3..0fc918282dc007e7e972e510a7b5bbaabf04b9da 100644 (file)
--- a/fdmdv2-dev/README.Win32
+++ b/fdmdv2-dev/README.Win32
@@ -77,12 +77,13 @@ are possible:
    $ cd codec2-dev\r
    $ mkdir build_win32\r
    $ cd build_win32\r
-   $ cmake -G "MSYS Makefiles" ..\r
+   $ cmake -DSPEEXDSP_INCLUDE_DIR=/usr/local/include/ -G "MSYS Makefiles" ..\r
    $ make\r
+   $ cp src/libcodec2.dll* /usr/local/lib\r
 \r
 11. freedv (dev version)\r
    $ check out fdmdv2-dev using tortise svn from:\r
-       wget https://freetel.svn.sourceforge.net/svnroot/freetel/fdmdv-dev\r
+       wget https://freetel.svn.sourceforge.net/svnroot/freetel/fdmdv2-dev\r
    $ cd fdmdv2-dev/src\r
    $ make -f Makefile.Win32\r
 \r

diff --git a/fdmdv2-dev/src/Makefile.win32 b/fdmdv2-dev/src/Makefile.win32
index 58e00d9d10b35f08a5fee585d3cd0a4fe1a13c6c..809d8b1c488f1e33fcb7456046362051c1fc05c5 100644 (file)
--- 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 bfe30d47c6740e93b6eb89b811ae8f12b4f5ced3..498804d59eac2a65e8eabc4881a948b9614fb5da 100644 (file)
--- 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();