mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-06-26 04:17:50 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Final work on MacOS compatibility

Browse Source
This commit is contained in:
Alexandre
2021-11-15 20:33:09 -06:00
parent 49cf6944f0
commit b81d0c47cf
13 changed files with 224 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source_modules/airspy_source/CMakeLists.txt
View File

@ -21,6 +21,8 @@ if (MSVC)
# Lib path
target_link_directories(airspy_source PRIVATE "C:/Program Files/PothosSDR/bin/")
target_include_directories(airspyhf_source PUBLIC "C:/Program Files/PothosSDR/include/libairspy/")
target_link_libraries(airspy_source PRIVATE airspy)
else (MSVC)
find_package(PkgConfig)

2
source_modules/airspy_source/src/main.cpp
View File

@ -7,7 +7,7 @@
#include <gui/style.h>
#include <config.h>
#include <options.h>
#include <libairspy/airspy.h>
#include <airspy.h>
#define CONCAT(a, b) ((std::string(a) + b).c_str())

2
source_modules/airspyhf_source/CMakeLists.txt
View File

@ -21,6 +21,8 @@ if (MSVC)
# Lib path
target_link_directories(airspyhf_source PRIVATE "C:/Program Files/PothosSDR/bin/")
target_include_directories(airspyhf_source PUBLIC "C:/Program Files/PothosSDR/include/libairspyhf/")
target_link_libraries(airspyhf_source PRIVATE airspyhf)
else (MSVC)
find_package(PkgConfig)

2
source_modules/airspyhf_source/src/main.cpp
View File

@ -7,7 +7,7 @@
#include <gui/style.h>
#include <config.h>
#include <options.h>
#include <libairspyhf/airspyhf.h>
#include <airspyhf.h>
#include <gui/widgets/stepped_slider.h>
#define CONCAT(a, b) ((std::string(a) + b).c_str())

9
source_modules/bladerf_source/CMakeLists.txt
View File

@ -23,8 +23,13 @@ if (MSVC)
target_link_libraries(bladerf_source PRIVATE bladeRF)
else (MSVC)
# Not in pkg-config
target_link_libraries(bladerf_source PRIVATE bladeRF)
find_package(PkgConfig)
pkg_check_modules(LIBBLADERF REQUIRED libbladeRF)
target_include_directories(bladerf_source PRIVATE ${LIBBLADERF_INCLUDE_DIRS})
target_link_directories(bladerf_source PRIVATE ${LIBBLADERF_LIBRARY_DIRS})
target_link_libraries(bladerf_source PRIVATE ${LIBBLADERF_LIBRARIES})
# Include it because for some reason pkgconfig doesn't look here?
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

2
source_modules/sdrplay_source/src/main.cpp
View File

@ -130,7 +130,7 @@ const char* ifModeTxt =
const char* rspduo_antennaPortsTxt = "Tuner 1 (50Ohm)\0Tuner 1 (Hi-Z)\0Tuner 2 (50Ohm)\0";
const char* agcModesTxt = "Off\0005Hz\00050Hz\000100Hz";
const char* agcModesTxt = "Off\0005Hz\00050Hz\000100Hz\000";
class SDRPlaySourceModule : public ModuleManager::Instance {
public: