Fix internal building of Codec2. Fix finding libraries under MinGW.

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

diff --git a/fdmdv2/CMakeLists.txt b/fdmdv2/CMakeLists.txt
index c36381ef8ef7d6c67695428172f492e9e252033f..b61a3782c70ea85c5eb4d160a6640c5fcfa14aea 100644 (file)
--- a/fdmdv2/CMakeLists.txt
+++ b/fdmdv2/CMakeLists.txt
@@ -37,7 +37,7 @@ message(STATUS "FreeDV version: ${FREEDV_VERSION}")
 #set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
 # Work around for not using a svn working copy.
-add_definitions(-DSVN_REVISION="1238")
+add_definitions(-DSVN_REVISION="1245")
 
 # Set default build flags.
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
@@ -117,6 +117,12 @@ if(MSVC)
     list(APPEND FREEDV_LINK_LIBS ${ADVAPI32} ${COMCTL32} ${COMDLG32} ${GDI32} ${KERNEL32} ${OLE32} ${OLEAUT32} ${RPCRT4} ${SHELL32} ${USER32} ${UUID} ${WINMM} ${WINSPOOL} ${WINSOCK32} ${WZEXPAT} ${WXJPEG} ${WXMSW29U} ${WXPNG} ${WXREGEXU} ${WXTIFF} ${WXZLIB})
 endif(MSVC)
 
+# Even using msys, cmake doesn't know it can use unix style paths...
+if(MINGW)
+    message(STATUS "System is MinGW.")
+    set(CMAKE_LIBRARY_PATH C:/MinGW/lib;C:/MinGW/msys/1.0/lib;C:/MinGW/msys/1.0/local/lib)
+endif(MINGW)
+
 # Math library is automatic on MSVC
 if(UNIX)
     set(CMAKE_REQUIRED_INCLUDES math.h)

diff --git a/fdmdv2/cmake/BuildCodec2.cmake b/fdmdv2/cmake/BuildCodec2.cmake
index 6f13bb0fa9c32f28cf972cd38e82158c1d5f2c89..5c6378d67b433b31e042535f7ee3f21ad225ff23 100644 (file)
--- a/fdmdv2/cmake/BuildCodec2.cmake
+++ b/fdmdv2/cmake/BuildCodec2.cmake
@@ -4,8 +4,13 @@ ExternalProject_Add(codec2
    CMAKE_ARGS -DBUILD_SHARED_LIBS=FALSE 
    INSTALL_COMMAND ""
 )
-find_library(CODEC2_LIBRARIES codec2
-    PATHS ${CMAKE_BINARY_DIR}/codec2-prefix/src/codec2-build/src)
+if(WIN32)
+    set(CODEC2_LIBRARIES
+        ${CMAKE_BINARY_DIR}/codec2-prefix/src/codec2-build/src/codec2.lib)
+else(WIN32)
+    set(CODEC2_LIBRARIES
+        ${CMAKE_BINARY_DIR}/codec2-prefix/src/codec2-build/src/libcodec2.a)
+endif(WIN32)
 include_directories(${CMAKE_BINARY_DIR}/codec2-prefix/src/codec2/src)
 list(APPEND FREEDV_LINK_LIBS ${CODEC2_LIBRARIES})
 list(APPEND FREEDV_STATIC_DEPS codec2)