hamradio/gqrx
1
0
Fork 0
mirror of https://github.com/gqrx-sdr/gqrx.git synced 2024-09-21 18:57:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #298 from ckuethe/make-it-compile

Browse Source 
Fix compilation issues.
This commit is contained in:
Alexandru Csete 2015-11-18 00:12:59 +01:00
commit a6b11d5b4d
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
CMakeLists.txt
View File

@ -66,9 +66,14 @@ endfunction(add_source_files)
# 3rd Party Dependency Stuff
find_package(Qt5 COMPONENTS Core Network Widgets REQUIRED)
find_package(Boost COMPONENTS system program_options REQUIRED)
set(GR_REQUIRED_COMPONENTS ANALOG AUDIO BLOCKS DIGITAL FILTER FFT)
set(GR_REQUIRED_COMPONENTS RUNTIME ANALOG AUDIO BLOCKS DIGITAL FILTER FFT)
find_package(Gnuradio REQUIRED)
find_package(Gnuradio-osmosdr REQUIRED)
if(NOT GNURADIO_RUNTIME_FOUND)
message(FATAL_ERROR "GnuRadio Runtime required to compile gr-air-modes")
endif()
IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
find_package(PulseAudio REQUIRED)
# there is a defect in the pulse audio cmake file that does not include this library. So we add it here.
@ -82,6 +87,17 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
#######################################################################################################################
# Finish configuring compiler / linker settings & flags
include_directories(
${CMAKE_SOURCE_DIR}/include
${Boost_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
)
link_directories(
${Boost_LIBRARY_DIRS}
${GNURADIO_RUNTIME_LIBRARY_DIRS}
)
#######################################################################################################################

8
src/dsp/filter/decimator.cpp
View File

@ -307,12 +307,12 @@ int Decimator::CHalfBand11TapDecimateBy2::DecBy2(int InLength,
for(i = 0; i < (InLength - 11 - 6) / 2; i++)
{
(*pOut).real() = H0 * pIn[0].real() + H2 * pIn[2].real()
(*pOut).real( H0 * pIn[0].real() + H2 * pIn[2].real()
+ H4 * pIn[4].real() + H5 * pIn[5].real() + H6 * pIn[6].real()
+ H8 * pIn[8].real() + H10 * pIn[10].real();
(*pOut++).imag() = H0 * pIn[0].imag() + H2 * pIn[2].imag()
+ H8 * pIn[8].real() + H10 * pIn[10].real());
(*pOut++).imag( H0 * pIn[0].imag() + H2 * pIn[2].imag()
+ H4 * pIn[4].imag() + H5 * pIn[5].imag() + H6 * pIn[6].imag()
+ H8 * pIn[8].imag() + H10 * pIn[10].imag();
+ H8 * pIn[8].imag() + H10 * pIn[10].imag());
pIn += 2;
}