version.h patch, thanks Tomas

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

diff --git a/codec2-dev/CMakeLists.txt b/codec2-dev/CMakeLists.txt
index 3fc50af52263993bfbb19139e8b96c0dfd352a11..4e70a3b50f17b5fefeb452166b4f36372c86655b 100644 (file)
--- a/codec2-dev/CMakeLists.txt
+++ b/codec2-dev/CMakeLists.txt
@@ -37,6 +37,7 @@ endif("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
 set(CODEC2_VERSION_MAJOR 0)
 set(CODEC2_VERSION_MINOR 8)
 # Set to patch level if needed, otherwise leave FALSE.
+# Must be positive (non-zero) if set, since 0 == FALSE in CMake.
 set(CODEC2_VERSION_PATCH FALSE)
 set(CODEC2_VERSION "${CODEC2_VERSION_MAJOR}.${CODEC2_VERSION_MINOR}")
 # Patch level version bumps should not change API/ABI.
@@ -53,7 +54,7 @@ endif()
 
 # Set default C++ flags.
 include(CheckCCompilerFlag)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O3 -D CODEC2_VERSION_MAJOR=${CODEC2_VERSION_MAJOR} -D CODEC2_VERSION_MINOR=${CODEC2_VERSION_MINOR}")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O3")
 CHECK_C_COMPILER_FLAG("-std=gnu11" COMPILER_SUPPORTS_GNU11)
 if(CMAKE_C_STANDARD_COMPUTED_DEFAULT EQUAL "90")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
@@ -140,6 +141,10 @@ check_function_exists(getopt HAVE_GETOPT)
 
 configure_file ("${PROJECT_SOURCE_DIR}/cmake/config.h.in"
                 "${PROJECT_BINARY_DIR}/config.h" )
+# Output path is such that #include <codec2/version.h> in codec2.h works
+set(CODEC2_VERSION_PATH "${PROJECT_BINARY_DIR}/codec2")
+configure_file ("${PROJECT_SOURCE_DIR}/cmake/version.h.in"
+                "${CODEC2_VERSION_PATH}/version.h" )
 include_directories(${PROJECT_BINARY_DIR})
 
 # CMake Package setup

diff --git a/codec2-dev/src/CMakeLists.txt b/codec2-dev/src/CMakeLists.txt
index 4feaca40c9fbcbfb0e0bed9041313b8aba72a2b0..ecd4981626a31e6843fd280c51e9660961fad82b 100644 (file)
--- a/codec2-dev/src/CMakeLists.txt
+++ b/codec2-dev/src/CMakeLists.txt
@@ -249,6 +249,7 @@ set(CODEC2_PUBLIC_HEADERS
     freedv_api.h
     varicode.h
     freedv_api_internal.h
+    ${CODEC2_VERSION_PATH}/version.h
 )
 
 #

diff --git a/codec2-dev/src/codec2.c b/codec2-dev/src/codec2.c
index 17c9a3291192bea6c592dd15f5be240da09d441c..62835e2cffeb29d5db06898d21f483ec1bf52b3e 100644 (file)
--- a/codec2-dev/src/codec2.c
+++ b/codec2-dev/src/codec2.c
@@ -1151,6 +1151,7 @@ void codec2_decode_1300(struct CODEC2 *c2, short speech[], const unsigned char *
 
     e_index = unpack_natural_or_gray(bits, &nbit, E_BITS, c2->gray);
     e[3] = decode_energy(e_index, E_BITS);
+    fprintf(stderr, "%d %f\n", e_index, e[3]);
 
     for(i=0; i<LSP_SCALAR_INDEXES; i++) {
        lsp_indexes[i] = unpack_natural_or_gray(bits, &nbit, lsp_bits(i), c2->gray);

diff --git a/codec2-dev/src/codec2.h b/codec2-dev/src/codec2.h
index 98ed32026df302837c92c8700225ca2a9e910481..a9e40e6031e2ea9a0fef1c9020d85767cea01d64 100644 (file)
--- a/codec2-dev/src/codec2.h
+++ b/codec2-dev/src/codec2.h
@@ -33,6 +33,8 @@
 #ifndef __CODEC2__
 #define  __CODEC2__
 
+#include <codec2/version.h>
+
 #define CODEC2_MODE_3200 0
 #define CODEC2_MODE_2400 1
 #define CODEC2_MODE_1600 2