VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-16 05:11:49 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1786 from srcejon/fix_zlib_url

Browse Source 
Fix Mac compilation
This commit is contained in:
Edouard Griffiths 2023-08-24 18:16:26 +02:00 committed by GitHub
commit 2565a38a98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
CMakeLists.txt
View File

@ -719,12 +719,21 @@ endif()
# When ENABLE_EXTERNAL_LIBRARIES is AUTO, we only build 3rd party libraries that aren't already available # When ENABLE_EXTERNAL_LIBRARIES is AUTO, we only build 3rd party libraries that aren't already available
# When ENABLE_EXTERNAL_LIBRARIES is OFF, we only use prebuilt libraries # When ENABLE_EXTERNAL_LIBRARIES is OFF, we only use prebuilt libraries
if (NOT ENABLE_EXTERNAL_LIBRARIES OR (ENABLE_EXTERNAL_LIBRARIES STREQUAL "AUTO")) if (NOT ENABLE_EXTERNAL_LIBRARIES)
find_package(Boost REQUIRED) find_package(Boost REQUIRED)
find_package(FFTW3F REQUIRED) find_package(FFTW3F REQUIRED)
if(NOT ANDROID) if(NOT ANDROID)
find_package(LibUSB REQUIRED) # used by so many packages find_package(LibUSB REQUIRED)
endif() endif()
elseif(ENABLE_EXTERNAL_LIBRARIES STREQUAL "AUTO")
find_package(Boost)
find_package(FFTW3F)
if(NOT ANDROID)
find_package(LibUSB)
endif()
endif()
if (NOT ENABLE_EXTERNAL_LIBRARIES OR (ENABLE_EXTERNAL_LIBRARIES STREQUAL "AUTO"))
find_package(OpenCV OPTIONAL_COMPONENTS core highgui imgproc imgcodecs videoio) # channeltx/modatv find_package(OpenCV OPTIONAL_COMPONENTS core highgui imgproc imgcodecs videoio) # channeltx/modatv
find_package(LibSigMF) # SigMF recording files support find_package(LibSigMF) # SigMF recording files support
find_package(ZLIB) # For DAB find_package(ZLIB) # For DAB
@ -770,20 +779,22 @@ if (NOT ENABLE_EXTERNAL_LIBRARIES OR (ENABLE_EXTERNAL_LIBRARIES STREQUAL "AUTO")
if(ENABLE_RTLSDR) if(ENABLE_RTLSDR)
find_package(LibRTLSDR) find_package(LibRTLSDR)
endif() endif()
if(ENABLE_SDRPLAY)
find_package(SDRplay)
endif()
if(ENABLE_SOAPYSDR) if(ENABLE_SOAPYSDR)
find_package(SoapySDR) find_package(SoapySDR)
endif() endif()
if(ENABLE_XTRX)
find_package(LibXTRX)
endif()
if(ENABLE_USRP) if(ENABLE_USRP)
find_package(UHD) find_package(UHD)
endif() endif()
endif() endif()
# The following devices can't yet be built by external/CMakeLists.txt, so always call find_package
if(ENABLE_SDRPLAY)
find_package(SDRplay)
endif()
if(ENABLE_XTRX)
find_package(LibXTRX)
endif()
if(ENABLE_EXTERNAL_LIBRARIES) if(ENABLE_EXTERNAL_LIBRARIES)
add_subdirectory(external) add_subdirectory(external)
find_package(Boost REQUIRED) find_package(Boost REQUIRED)

2
external/CMakeLists.txt vendored
View File

@ -269,7 +269,7 @@ endif (NOT OPUS_FOUND AND NOT USE_PRECOMPILED_LIBS)
if (NOT ZLIB_FOUND AND NOT USE_PRECOMPILED_LIBS) if (NOT ZLIB_FOUND AND NOT USE_PRECOMPILED_LIBS)
ExternalProject_Add(zlib ExternalProject_Add(zlib
URL https://zlib.net/zlib-1.2.13.tar.gz URL https://zlib.net/current/zlib.tar.gz
PREFIX "${EXTERNAL_BUILD_LIBRARIES}/zlib" PREFIX "${EXTERNAL_BUILD_LIBRARIES}/zlib"
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR>
TEST_COMMAND "" TEST_COMMAND ""

4
plugins/feature/gs232controller/inputcontroller.cpp
View File

@ -15,6 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // // along with this program. If not, see <http://www.gnu.org/licenses/>. //
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include <cmath>
#ifdef QT_GAMEPAD_FOUND #ifdef QT_GAMEPAD_FOUND
#include <QGamepadManager> #include <QGamepadManager>
#include "gamepadinputcontroller.h" #include "gamepadinputcontroller.h"
@ -25,7 +27,7 @@
double InputController::getAxisCalibratedValue(int axis, InputControllerSettings *settings, bool highSensitvity) double InputController::getAxisCalibratedValue(int axis, InputControllerSettings *settings, bool highSensitvity)
{ {
double value = getAxisValue(axis); double value = getAxisValue(axis);
double absValue = abs(value); double absValue = std::abs(value);
double l = settings->m_deadzone[axis] / 100.0; double l = settings->m_deadzone[axis] / 100.0;
if (absValue < l) { if (absValue < l) {
// Set to 0 if in deadzone // Set to 0 if in deadzone