From 2f8b59d3df1528fbcc280df97cef3813aa4c5ca7 Mon Sep 17 00:00:00 2001 From: nivex Date: Wed, 2 Aug 2017 03:36:52 +0000 Subject: [PATCH] - Update trunk version info to 0.8 - Append CODEC2_VERSION_{MAJOR,MINOR} to make flags to expose them to compiler - Update c2enc to encode version info into header for .c2 files git-svn-id: https://svn.code.sf.net/p/freetel/code@3343 01035d8c-6547-0410-b346-abe4f91aad63 --- codec2-dev/CMakeLists.txt | 4 ++-- codec2-dev/src/c2enc.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/codec2-dev/CMakeLists.txt b/codec2-dev/CMakeLists.txt index 80f74112..3fc50af5 100644 --- a/codec2-dev/CMakeLists.txt +++ b/codec2-dev/CMakeLists.txt @@ -35,7 +35,7 @@ endif("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") # file at some point. # set(CODEC2_VERSION_MAJOR 0) -set(CODEC2_VERSION_MINOR 7) +set(CODEC2_VERSION_MINOR 8) # Set to patch level if needed, otherwise leave FALSE. set(CODEC2_VERSION_PATCH FALSE) set(CODEC2_VERSION "${CODEC2_VERSION_MAJOR}.${CODEC2_VERSION_MINOR}") @@ -53,7 +53,7 @@ endif() # Set default C++ flags. include(CheckCCompilerFlag) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O3") +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O3 -D CODEC2_VERSION_MAJOR=${CODEC2_VERSION_MAJOR} -D CODEC2_VERSION_MINOR=${CODEC2_VERSION_MINOR}") 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") diff --git a/codec2-dev/src/c2enc.c b/codec2-dev/src/c2enc.c index 66f94a95..c33c2108 100644 --- a/codec2-dev/src/c2enc.c +++ b/codec2-dev/src/c2enc.c @@ -99,11 +99,10 @@ int main(int argc, char *argv[]) struct c2_header out_hdr; memcpy(out_hdr.magic,c2_file_magic,sizeof(c2_file_magic)); out_hdr.mode = mode; - // TODO: Get these values from somewhere - out_hdr.version_major = 0; - out_hdr.version_minor = 0; + out_hdr.version_major = CODEC2_VERSION_MAJOR; + out_hdr.version_minor = CODEC2_VERSION_MINOR; + // TODO: Handle flags (this block needs to be moved down) out_hdr.flags = 0; - fwrite(&out_hdr,sizeof(out_hdr),1,fout); }; }; -- 2.25.1