VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-02-03 09:44:01 -05:00
Code Issues Projects Releases Wiki Activity

libfreedv: fix some inconsistent use of complex, C99, and C++11

Browse Source 
done by @guruofquality
thanks a lot!
This commit is contained in:
Davide Gerhard 2019-04-15 10:54:27 +02:00
parent 190fe374f2
commit 21add46422
No known key found for this signature in database
GPG Key ID: 7CBEFA144857DC97
5 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -54,6 +54,13 @@ endif()
set(QT_USE_QTOPENGL TRUE) set(QT_USE_QTOPENGL TRUE)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
if(APPLE AND EXISTS /usr/local/opt/qt5)
# Homebrew installs Qt5 (up to at least 5.9.1) in
# /usr/local/qt5, ensure it can be found by CMake since
# it is not in the default /usr/local prefix.
list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/qt5")
endif()
#find_package(Qt4 REQUIRED) #find_package(Qt4 REQUIRED)
find_package(Qt5Core 5.0 REQUIRED) find_package(Qt5Core 5.0 REQUIRED)
find_package(Qt5Widgets 5.0 REQUIRED) find_package(Qt5Widgets 5.0 REQUIRED)

4
libfreedv/CMakeLists.txt
View File

@ -1,5 +1,7 @@
project(freedv) project(freedv)
set(CMAKE_CXX_STANDARD 11)
set(freedv_SOURCES set(freedv_SOURCES
codec2_fft.cpp codec2_fft.cpp
cohpsk.cpp cohpsk.cpp
@ -80,4 +82,4 @@ target_link_libraries(freedv
${CODEC2_LIBRARIES} ${CODEC2_LIBRARIES}
) )
install(TARGETS freedv DESTINATION lib) install(TARGETS freedv DESTINATION lib)

2
libfreedv/freedv_filter.cpp
View File

@ -25,7 +25,7 @@
#include "fdv_arm_math.h" #include "fdv_arm_math.h"
#define cmplx(value) (std::complex<float>{cosf(value), sinf(value)}) #define cmplx(value) (COSF(value) + SINF(value) * std::complex<float>(0.0f, 1.0f))
namespace FreeDV namespace FreeDV
{ {

1
libfreedv/freedv_vhf_framing.h
View File

@ -36,6 +36,7 @@
#ifndef _FREEDV_VHF_FRAMING_H #ifndef _FREEDV_VHF_FRAMING_H
#define _FREEDV_VHF_FRAMING_H #define _FREEDV_VHF_FRAMING_H
#include <cstddef>
#include "freedv_data_channel.h" #include "freedv_data_channel.h"
/* Standard frame type */ /* Standard frame type */

2
libfreedv/ofdm_internal.h
View File

@ -41,7 +41,7 @@
#endif #endif
#define TAU (2.0f * M_PI) #define TAU (2.0f * M_PI)
#define ROT45 (M_PI / 4.0f) #define ROT45 float(M_PI / 4.0f)
#define cmplx(value) (std::complex<float>{cosf(value), sinf(value)}) #define cmplx(value) (std::complex<float>{cosf(value), sinf(value)})
#define cmplxconj(value) (std::complex<float>{cosf(value), -sinf(value)}) #define cmplxconj(value) (std::complex<float>{cosf(value), -sinf(value)})