Update references of codec2-dev to codec2.

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

diff --git a/codec2/README_fdmdv.txt b/codec2/README_fdmdv.txt
index 81c8c4df3a82369b5969d3ad6ea83c80132ecf9a..fd920ba930546c6c118a6b066b3dd098f5dd3290 100644 (file)
--- a/codec2/README_fdmdv.txt
+++ b/codec2/README_fdmdv.txt
@@ -17,7 +17,7 @@ operation of the Octave and C versions are identical.
 Quickstart
 ----------
 
-$ cd codec2-dev
+$ cd codec2
 $ ./configure && make
 $ cd src
 

diff --git a/codec2/asterisk/README b/codec2/asterisk/README
index a2d3b512370b05564fe308888203e055110f2895..9bc814b442d6a2add55bc629b513ca8ae2b3e7d1 100644 (file)
--- a/codec2/asterisk/README
+++ b/codec2/asterisk/README
@@ -17,18 +17,18 @@ Asterisk must be patched so that the core understand Codec 2 frames.
 
 1/ First install Codec 2:
 
-    david@cool:~$ svn co https://freetel.svn.sourceforge.net/svnroot/freetel/codec2-dev codec2-dev
-    david@cool:~/codec2-dev$ cd codec2-dev
-    david@cool:~/codec2-dev$ ./configure && make && sudo make install
-    david@bear:~/codec2-dev$ sudo ldconfig -v
-    david@cool:~/codec2-dev$ cd ~
+    david@cool:~$ svn co https://freetel.svn.sourceforge.net/svnroot/freetel/codec2 codec2
+    david@cool:~/codec2$ cd codec2
+    david@cool:~/codec2$ ./configure && make && sudo make install
+    david@bear:~/codec2$ sudo ldconfig -v
+    david@cool:~/codec2$ cd ~
 
 2/ Then build Asterisk with Codec 2 support:
 
     david@cool:~$ tar xvzf asterisk-1.8.9.0.tar.gz
-    david@cool:~/asterisk-1.8.9.0$ patch -p4 < ~/codec2-dev/asterisk/asterisk-codec2.patch
-    david@cool:~/asterisk-1.8.9.0$ cp ~/codec2-dev/asterisk/codec_codec2.c .
-    david@cool:~/asterisk-1.8.9.0$ cp ~/codec2-dev/asterisk/ex_codec2.h ./codecs
+    david@cool:~/asterisk-1.8.9.0$ patch -p4 < ~/codec2/asterisk/asterisk-codec2.patch
+    david@cool:~/asterisk-1.8.9.0$ cp ~/codec2/asterisk/codec_codec2.c .
+    david@cool:~/asterisk-1.8.9.0$ cp ~/codec2/asterisk/ex_codec2.h ./codecs
     david@cool:~/asterisk-1.8.9.0$ ./configure && make ASTLDFLAGS=-lcodec2
     david@cool:~/asterisk-1.8.9.0$ sudo make install
     david@cool:~/asterisk-1.8.9.0$ sudo make samples

diff --git a/codec2/octave/codec2_demo.m b/codec2/octave/codec2_demo.m
index 0f3950bf5d3a04eaf5e2a0f41ba8662413e1a3c0..6cd2697080124aa64799ae7c6ab3e18451a0e4ce 100644 (file)
--- a/codec2/octave/codec2_demo.m
+++ b/codec2/octave/codec2_demo.m
@@ -8,7 +8,7 @@
 % for conference and user group presentations on a projector.  An
 % alternative to static overhead slides.
 %
-% Derived from codec2-dev/octave/plamp.m
+% Derived from codec2/octave/plamp.m
 %
 % usage:
 %   octave:1> plamp("../src/hts2a",40)
@@ -22,7 +22,7 @@
 %
 % The text files used as input are generated using c2sim:
 %
-%   /codec2-dev/src$ c2sim ../raw/hts2a.raw --dump hts2a
+%   /codec2/src$ c2sim ../raw/hts2a.raw --dump hts2a
 %
 % The Codec 2 README explains how to build c2sim with dump files
 % enabled.

diff --git a/codec2/octave/tget_spec.m b/codec2/octave/tget_spec.m
index e46c1ea0bf0fb80b5e34ddabecbacca0995f674d..593f2af2dc85dae99a11c0c5254962e386125860 100644 (file)
--- a/codec2/octave/tget_spec.m
+++ b/codec2/octave/tget_spec.m
@@ -3,7 +3,7 @@
 % Used in conjunction with src/fdmdv_demod to test the
 % fdmdv_get_rx_spectrum() function.
 %
-% codec2-dev/src$ ./fdmdv_demod fdmdv_mod.raw tmp.c2 dump.txt
+% codec2/src$ ./fdmdv_demod fdmdv_mod.raw tmp.c2 dump.txt
 % octave:3> tget_spec("../src/dump.txt")
 %
 % Copyright David Rowe 2012

diff --git a/codec2/stm32/README.txt b/codec2/stm32/README.txt
index 0a8885eae37789c43b5275a6ab571f7bcb79e3df..9b79ee887b06a98daa7a9ebc90c3cb3890db8be4 100644 (file)
--- a/codec2/stm32/README.txt
+++ b/codec2/stm32/README.txt
@@ -50,17 +50,17 @@ Getting Started
 
 . Place a copy of hts1a.raw in the stlink directory and start st-util:
 
-   ~/stlink$ cp ~/codec2-dev/raw/hts1a.raw stm_in.raw
-   ~/stlink$ sudo ./st-util -f /home/david/codec2-dev/stm32/stm32f4_codec2.elf
+   ~/stlink$ cp ~/codec2/raw/hts1a.raw stm_in.raw
+   ~/stlink$ sudo ./st-util -f /home/david/codec2/stm32/stm32f4_codec2.elf
 
 . In _another_ console start gdb:
 
-   $ ~/codec2-dev/stm32$ ~/gcc-arm-none-eabi-4_7-2013q1/bin/arm-none-eabi-gdb stm32f4_codec2.elf
+   $ ~/codec2/stm32$ ~/gcc-arm-none-eabi-4_7-2013q1/bin/arm-none-eabi-gdb stm32f4_codec2.elf
 
    (gdb) tar ext :4242
 
    (gdb) load
-   `/home/david/codec2-dev/stm32/fft_test.elf' has changed; re-reading symbols.
+   `/home/david/codec2/stm32/fft_test.elf' has changed; re-reading symbols.
     Loading section .isr_vector, size 0x188 lma 0x8000000
     Loading section .text, size 0x1a4b4 lma 0x8000188
     Loading section .data, size 0x28f0 lma 0x801a63c

diff --git a/fdmdv2/README.Win32 b/fdmdv2/README.Win32
index 7a40e6da34753fb2241b39dc4a4bee4af6ffb347..3fc3f28eac6f24986fe2516e6595886c6d711ef5 100644 (file)
--- a/fdmdv2/README.Win32
+++ b/fdmdv2/README.Win32
@@ -63,8 +63,8 @@ Many variations are possible.
    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
-   $ cd codec2-dev\r
+   $ wget https://freetel.svn.sourceforge.net/svnroot/freetel/codec2\r
+   $ cd codec2\r
    $ ./configure && make\r
 \r
 10. svn co fdmdv2\r

diff --git a/fdmdv2/README.osx b/fdmdv2/README.osx
index e8787c771a041a83fcb9050589b3c0fc6b196fdb..1e3eeca9aedff06a9ad4e0bd3a03c69f9aa2e330 100644 (file)
--- a/fdmdv2/README.osx
+++ b/fdmdv2/README.osx
@@ -136,7 +136,7 @@ Index: src/Makefile.osx
 +
 +# Codec 2 -----------------------------------------------
 +
-+CODEC2=codec2-dev
++CODEC2=codec2
 +CODEC2_INC=-I$(CODEC2)/src
 +CODEC2_LIB=$(CODEC2)/src/.libs/libcodec2.a
 +
@@ -196,7 +196,7 @@ Index: src/Makefile.osx
 +      cd $(CODEC2) && CPPFLAGS="-arch i386" LDFLAGS="-arch i386" ./configure && make && touch .built
 +
 +$(CODEC2):
-+      svn co https://freetel.svn.sourceforge.net/svnroot/freetel/codec2-dev
++      svn co https://freetel.svn.sourceforge.net/svnroot/freetel/codec2
 \ No newline at end of file
 Index: src/Makefile.win32
 ===================================================================

diff --git a/fdmdv2/build/codelite/fdmdv2.mk b/fdmdv2/build/codelite/fdmdv2.mk
index c5255976d95c659e481449965d08e373968826e6..1864ae1d3bc6259722353b0b1384c4ea57828465 100644 (file)
--- a/fdmdv2/build/codelite/fdmdv2.mk
+++ b/fdmdv2/build/codelite/fdmdv2.mk
@@ -38,12 +38,12 @@ MakeDirCommand         :=makedir
 RcCmpOptions           := $(shell wx-config --rcflags)\r
 RcCompilerName         :=windres\r
 LinkOptions            :=  -mwindows $(shell wx-config --debug=yes --libs --unicode=yes)\r
-IncludePath            :=  $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.7.1/msys/1.0/local/include $(IncludeSwitch)../../../codec2-dev/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/include \r
+IncludePath            :=  $(IncludeSwitch). $(IncludeSwitch)/bin/MinGW-4.7.1/msys/1.0/local/include $(IncludeSwitch)../../../codec2/src $(IncludeSwitch)/bin/Projects/Audio/libsndfile/include \r
 IncludePCH             := \r
 RcIncludePath          := \r
 Libs                   := $(LibrarySwitch)sndfile-1 $(LibrarySwitch)codec2 $(LibrarySwitch)portaudio $(LibrarySwitch)portaudiocpp $(LibrarySwitch)samplerate.dll $(LibrarySwitch)ctb-0.16 $(LibrarySwitch)sox \r
 ArLibs                 :=  "libsndfile-1.dll" "codec2" "libportaudio.a" "libportaudiocpp.a" "libsamplerate.dll.a" "libctb-0.16.a" "libsox" \r
-LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)d:/Projects/Radio/codec2-dev/src/.libs $(LibraryPathSwitch)d:/bin/MinGW-4.7.1/msys/1.0/local/lib \r
+LibPath                := $(LibraryPathSwitch). $(LibraryPathSwitch)d:/Projects/Radio/codec2/src/.libs $(LibraryPathSwitch)d:/bin/MinGW-4.7.1/msys/1.0/local/lib \r
 \r
 ##\r
 ## Common variables\r
@@ -204,13 +204,13 @@ $(IntermediateDirectory)/src_dlg_about$(DependSuffix): ../../src/dlg_about.cpp
 $(IntermediateDirectory)/src_dlg_about$(PreprocessSuffix): ../../src/dlg_about.cpp\r
        @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_dlg_about$(PreprocessSuffix) "../../src/dlg_about.cpp"\r
 \r
-$(IntermediateDirectory)/src_golay23$(ObjectSuffix): ../../../codec2-dev/src/golay23.c $(IntermediateDirectory)/src_golay23$(DependSuffix)\r
-       $(CC) $(SourceSwitch) "D:/Projects/Radio/codec2-dev/src/golay23.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_golay23$(ObjectSuffix) $(IncludePath)\r
-$(IntermediateDirectory)/src_golay23$(DependSuffix): ../../../codec2-dev/src/golay23.c\r
-       @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_golay23$(ObjectSuffix) -MF$(IntermediateDirectory)/src_golay23$(DependSuffix) -MM "../../../codec2-dev/src/golay23.c"\r
+$(IntermediateDirectory)/src_golay23$(ObjectSuffix): ../../../codec2/src/golay23.c $(IntermediateDirectory)/src_golay23$(DependSuffix)\r
+       $(CC) $(SourceSwitch) "D:/Projects/Radio/codec2/src/golay23.c" $(CFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/src_golay23$(ObjectSuffix) $(IncludePath)\r
+$(IntermediateDirectory)/src_golay23$(DependSuffix): ../../../codec2/src/golay23.c\r
+       @$(CC) $(CFLAGS) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/src_golay23$(ObjectSuffix) -MF$(IntermediateDirectory)/src_golay23$(DependSuffix) -MM "../../../codec2/src/golay23.c"\r
 \r
-$(IntermediateDirectory)/src_golay23$(PreprocessSuffix): ../../../codec2-dev/src/golay23.c\r
-       @$(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_golay23$(PreprocessSuffix) "../../../codec2-dev/src/golay23.c"\r
+$(IntermediateDirectory)/src_golay23$(PreprocessSuffix): ../../../codec2/src/golay23.c\r
+       @$(CC) $(CFLAGS) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/src_golay23$(PreprocessSuffix) "../../../codec2/src/golay23.c"\r
 \r
 \r
 -include $(IntermediateDirectory)/*$(DependSuffix)\r

diff --git a/fdmdv2/build/codelite/fdmdv2.project b/fdmdv2/build/codelite/fdmdv2.project
index f542f8fbe7c600b3a27db5d4be8bafeb59944679..acef6effd9d5f689e9575c3c9b9e17429db966b7 100644 (file)
--- a/fdmdv2/build/codelite/fdmdv2.project
+++ b/fdmdv2/build/codelite/fdmdv2.project
@@ -22,7 +22,7 @@
     <File Name="../../src/varicode.c"/>
     <File Name="../../src/sox_biquad.c"/>
     <File Name="../../src/dlg_about.cpp"/>
-    <File Name="../../../codec2-dev/src/golay23.c"/>
+    <File Name="../../../codec2/src/golay23.c"/>
   </VirtualDirectory>
   <VirtualDirectory Name="include">
     <File Name="../../src/dlg_comports.h"/>
@@ -34,7 +34,7 @@
     <File Name="../../src/fdmdv2_pa_wrapper.h"/>
     <File Name="../../src/comp.h"/>
     <File Name="../../src/fdmdv2_plot_scalar.h"/>
-    <File Name="../../../codec2-dev/src/codec2.h"/>
+    <File Name="../../../codec2/src/codec2.h"/>
     <File Name="../../src/fdmdv2_defines.h"/>
     <File Name="../../../Audio/libsndfile/include/sndfile.h"/>
     <File Name="../../src/fdmdv2_plot_waterfall_linux.h"/>
@@ -47,7 +47,7 @@
     <File Name="../../../../Audio/portaudio/include/portaudio.h"/>
     <File Name="../../src/dlg_filter.h"/>
     <File Name="../../src/version.h"/>
-    <File Name="../../../codec2-dev/src/golay23.h"/>
+    <File Name="../../../codec2/src/golay23.h"/>
   </VirtualDirectory>
   <VirtualDirectory Name="resources">
     <File Name="../../src/FDMDV2.fbp"/>
@@ -67,14 +67,14 @@
     <Configuration Name="Debug" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
       <Compiler Options="-g;-O0;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=yes)" C_Options="-g;-O0;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=yes)" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
         <IncludePath Value="/bin/MinGW-4.7.1/msys/1.0/local/include"/>
-        <IncludePath Value="../../../codec2-dev/src"/>
+        <IncludePath Value="../../../codec2/src"/>
         <IncludePath Value="/bin/Projects/Audio/libsndfile/include"/>
         <Preprocessor Value="__WX__"/>
         <Preprocessor Value="_NO_AUTOTOOLS_=1"/>
         <Preprocessor Value="DMW=1"/>
       </Compiler>
       <Linker Options="-mwindows;$(shell wx-config --debug=yes --libs --unicode=yes)" Required="yes">
-        <LibraryPath Value="d:/Projects/Radio/codec2-dev/src/.libs"/>
+        <LibraryPath Value="d:/Projects/Radio/codec2/src/.libs"/>
         <LibraryPath Value="d:/bin/MinGW-4.7.1/msys/1.0/local/lib"/>
         <Library Value="libsndfile-1.dll"/>
         <Library Value="codec2"/>
@@ -119,7 +119,7 @@
     <Configuration Name="Release" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
       <Compiler Options="-O2;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=no)" C_Options="-O2;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=no)" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
         <IncludePath Value="/bin/MinGW-4.7.1/msys/1.0/local/include"/>
-        <IncludePath Value="../../../codec2-dev/src"/>
+        <IncludePath Value="../../../codec2/src"/>
         <IncludePath Value="../../../Audio/portaudio/include"/>
         <IncludePath Value="../../../Audio/libsndfile/include"/>
         <IncludePath Value="../../../Audio/libsamplerate-0.1.8/src"/>
@@ -128,7 +128,7 @@
         <Preprocessor Value="_NO_AUTOTOOLS_=1"/>
       </Compiler>
       <Linker Options="-mwindows;-s;$(shell wx-config --debug=no --libs --unicode=yes)" Required="yes">
-        <LibraryPath Value="d:/Projects/Radio/codec2-dev/src/.libs"/>
+        <LibraryPath Value="d:/Projects/Radio/codec2/src/.libs"/>
         <LibraryPath Value="d:/bin/MinGW-4.7.1/msys/1.0/local/lib"/>
         <LibraryPath Value="d:/Projects/Audio/libsndfile/lib"/>
         <Library Value="libsndfile-1.dll"/>

diff --git a/fdmdv2/cmake/BuildCodec2.cmake b/fdmdv2/cmake/BuildCodec2.cmake
index d7ddcf936229a87f488234e2dfdccdb1dbc30909..f56a186b8a3d04d5411948d94df14beeaea31382 100644 (file)
--- a/fdmdv2/cmake/BuildCodec2.cmake
+++ b/fdmdv2/cmake/BuildCodec2.cmake
@@ -1,6 +1,6 @@
 include(ExternalProject)
 ExternalProject_Add(codec2
-   SVN_REPOSITORY https://svn.code.sf.net/p/freetel/code/codec2-dev
+   SVN_REPOSITORY https://svn.code.sf.net/p/freetel/code/codec2
    CMAKE_ARGS -DBUILD_SHARED_LIBS=FALSE 
    INSTALL_COMMAND ""
 )

diff --git a/fdmdv2/fdmdv2.project b/fdmdv2/fdmdv2.project
index bd5b0f329c34bceed3990177cd2e54c9fb0b6f36..1e699ebc2f7994511e17b352dcd6729ab5e1f05c 100644 (file)
--- a/fdmdv2/fdmdv2.project
+++ b/fdmdv2/fdmdv2.project
@@ -52,8 +52,8 @@
       <File Name="extern/include/portaudiocpp/SystemHostApiIterator.hxx"/>
     </VirtualDirectory>
     <File Name="paclass.h"/>
-    <File Name="../codec2-dev/src/codec2.h"/>
-    <File Name="../codec2-dev/src/fdmdv.h"/>
+    <File Name="../codec2/src/codec2.h"/>
+    <File Name="../codec2/src/fdmdv.h"/>
   </VirtualDirectory>
   <VirtualDirectory Name="resources">
     <File Name="FDMDV2.fbp"/>
@@ -73,7 +73,7 @@
     <Configuration Name="Debug" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
       <Compiler Options="-g;-O0;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=yes)" C_Options="-g;-O0;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=yes)" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
         <IncludePath Value="/bin/MinGW/msys/1.0/local/include"/>
-        <IncludePath Value="../codec2-dev/src"/>
+        <IncludePath Value="../codec2/src"/>
         <Preprocessor Value="__WX__"/>
       </Compiler>
       <Linker Options="-mwindows;$(shell wx-config --debug=yes --libs --unicode=yes)" Required="yes">
@@ -118,7 +118,7 @@
     <Configuration Name="Release" CompilerType="gnu g++" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append">
       <Compiler Options="-O2;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=no)" C_Options="-O2;-Wall;$(shell wx-config --cxxflags --unicode=yes --debug=no)" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" UseDifferentPCHFlags="no" PCHFlags="">
         <IncludePath Value="/bin/MinGW/msys/1.0/local/include"/>
-        <IncludePath Value="../codec2-dev/src"/>
+        <IncludePath Value="../codec2/src"/>
         <IncludePath Value="../../Audio/portaudio/include"/>
         <IncludePath Value="../../Audio/portaudio/bindings/cpp/include"/>
         <IncludePath Value="./libsndfile/include"/>

diff --git a/fdmdv2/src/Makefile.linux b/fdmdv2/src/Makefile.linux
index b0de67a46012be433582c409f422aeb35c257047..f49e9e2aa976308f5c10fa4f523bf2ced70b925a 100644 (file)
--- a/fdmdv2/src/Makefile.linux
+++ b/fdmdv2/src/Makefile.linux
@@ -52,7 +52,7 @@ endif
 
 # Codec 2 -----------------------------------------------
 
-CODEC2=codec2-dev
+CODEC2=codec2
 CODEC2_INC=-I$(CODEC2)/src
 CODEC2_LIB=$(CODEC2)/src/.libs/libcodec2.a
 
@@ -112,7 +112,7 @@ dlg_filter.o \
 dlg_options.o \
 varicode.o \
 sox_biquad.o \
-codec2-dev/src/golay23.c \
+codec2/src/golay23.c \
 hamlib.o
 
 all: $(LIBS_TO_BUILD) $(CODEC2)/.built freedv
@@ -167,7 +167,7 @@ $(CODEC2)/.built: $(CODEC2)
        cd $(CODEC2) && ./configure && make && touch .built
 
 $(CODEC2):
-       svn co https://freetel.svn.sourceforge.net/svnroot/freetel/codec2-dev
+       svn co https://freetel.svn.sourceforge.net/svnroot/freetel/codec2
         
 # sox -------------------------------------------------------------
 

diff --git a/fdmdv2/src/Makefile.linux.dmw b/fdmdv2/src/Makefile.linux.dmw
index d12ae25b24331c8816ca8746ed8eda261019f533..bb835cda88225381944064a8051c69eef3b8f2b4 100644 (file)
--- a/fdmdv2/src/Makefile.linux.dmw
+++ b/fdmdv2/src/Makefile.linux.dmw
@@ -8,7 +8,7 @@
 # EDIT THESE FOR YOUR SYSTEM ----------------------------
 
 WX_GTK_PATH=/home/wittend/Projects/wxWidgets-2.9.4/build_gtk
-CODEC2_PATH=/home/wittend/Projects/codec2-dev
+CODEC2_PATH=/home/wittend/Projects/codec2
 # SOX_LIB_PATH=$(HOME)/sox-14.4.0/src/.libs - not required because I installed soxlib from the repo.
 
 # END EDITS ---------------------------------------------

diff --git a/fdmdv2/src/Makefile.win32 b/fdmdv2/src/Makefile.win32
index 58e00d9d10b35f08a5fee585d3cd0a4fe1a13c6c..7ae88d7fa8d0cfa5a47ecf0241ef8ebf1a031cce 100644 (file)
--- a/fdmdv2/src/Makefile.win32
+++ b/fdmdv2/src/Makefile.win32
@@ -5,7 +5,7 @@
 #
 # $ make -f Makefile.Win32
 
-CODEC2_PATH=$(HOME)/codec2-dev
+CODEC2_PATH=$(HOME)/codec2
 INCLUDE_PATH=/usr/local/include
 
 WX_CONFIG=wx-config
@@ -33,9 +33,9 @@ dlg_filter.o \
 varicode.o \
 sox_biquad.o \
 hamlib.o \
-../../codec2-dev/src/golay23.o
+../../codec2/src/golay23.o
 
-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.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.h fdmdv2_plot_scatter.h fdmdv2_plot_spectrum.h fdmdv2_pa_wrapper.h topFrame.h dlg_audiooptions.h topFrame.h varicode.h ../../codec2/src/golay23.h hamlib.h
 
 all: freedv
 

diff --git a/fdmdv2/src/Makefile.win32.dmw b/fdmdv2/src/Makefile.win32.dmw
index 8b968caf33faf46b37feff2553d6d2932d704976..739124fd4f9ebcf787b3cf4bbad26dc65ed8ae86 100644 (file)
--- a/fdmdv2/src/Makefile.win32.dmw
+++ b/fdmdv2/src/Makefile.win32.dmw
@@ -6,7 +6,7 @@
 
 # EDIT THESE FOR YOUR SYSTEM ----------------------------
 
-CODEC2_PATH=D:/Projects/Radio/codec2-dev
+CODEC2_PATH=D:/Projects/Radio/codec2
 INCLUDE_PATH=d:/bin/MinGW-4.6.1/msys/1.0/local/lib
 
 # not required because I installed soxlib in my: