From f8268082046f84e26170ecefba4fe8f19ad9b680 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 13 Nov 2017 01:54:29 +0100 Subject: [PATCH] Fixed cmake file of internal librtlsdr since upgrade to 0.7.0+ --- librtlsdr/CMakeLists.txt | 17 +++++++++++++++-- librtlsdr/librtlsdr.pro | 19 ++++++++++++++++--- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/librtlsdr/CMakeLists.txt b/librtlsdr/CMakeLists.txt index 4914925dd..dda9bcdd6 100644 --- a/librtlsdr/CMakeLists.txt +++ b/librtlsdr/CMakeLists.txt @@ -6,18 +6,31 @@ find_package(LibUSB) set(rtlsdr_SOURCES ${LIBRTLSDRSRC}/src/librtlsdr.c + ${LIBRTLSDRSRC}/src/rtlsdr_rpc_msg.c + ${LIBRTLSDRSRC}/src/rtlsdr_rpc.c ${LIBRTLSDRSRC}/src/tuner_e4k.c ${LIBRTLSDRSRC}/src/tuner_fc0012.c ${LIBRTLSDRSRC}/src/tuner_fc0013.c ${LIBRTLSDRSRC}/src/tuner_fc2580.c ${LIBRTLSDRSRC}/src/tuner_r82xx.c ${LIBRTLSDRSRC}/src/getopt/getopt.c + ${LIBRTLSDRSRC}/src/convenience/convenience.c ) set(rtlsdr_HEADERS - ${LIBRTLSDRSRC}/include/rtl-sdr.h + ${LIBRTLSDRSRC}/include/reg_field.h ${LIBRTLSDRSRC}/include/rtl-sdr_export.h - ${LIBRTLSDRSRC}/src/getopt/getopt.h + ${LIBRTLSDRSRC}/include/rtlsdr_i2c.h + ${LIBRTLSDRSRC}/include/rtlsdr_rpc_msg.h + ${LIBRTLSDRSRC}/include/rtlsdr_rpc.h + ${LIBRTLSDRSRC}/include/rtl-sdr.h + ${LIBRTLSDRSRC}/include/tuner_e4k.h + ${LIBRTLSDRSRC}/include/tuner_fc0012.h + ${LIBRTLSDRSRC}/include/tuner_fc0013.h + ${LIBRTLSDRSRC}/include/tuner_fc2580.h + ${LIBRTLSDRSRC}/include/tuner_r82xx.h + ${LIBRTLSDRSRC}/include/getopt/getopt.h + ${LIBRTLSDRSRC}/src/convenience/convenience.h ) include_directories( diff --git a/librtlsdr/librtlsdr.pro b/librtlsdr/librtlsdr.pro index 30593e0a7..513ab69fb 100644 --- a/librtlsdr/librtlsdr.pro +++ b/librtlsdr/librtlsdr.pro @@ -17,16 +17,29 @@ CONFIG(MINGW32):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" CONFIG(MINGW64):INCLUDEPATH += "D:\softs\libusb-1.0.20\include\libusb-1.0" SOURCES = $$LIBRTLSDRSRC/src/librtlsdr.c\ + $$LIBRTLSDRSRC/src/rtlsdr_rpc_msg.c\ + $$LIBRTLSDRSRC/src/rtlsdr_rpc.c\ $$LIBRTLSDRSRC/src/tuner_e4k.c\ $$LIBRTLSDRSRC/src/tuner_fc0012.c\ $$LIBRTLSDRSRC/src/tuner_fc0013.c\ $$LIBRTLSDRSRC/src/tuner_fc2580.c\ $$LIBRTLSDRSRC/src/tuner_r82xx.c\ - $$LIBRTLSDRSRC/src/getopt/getopt.c + $$LIBRTLSDRSRC/src/getopt/getopt.c\ + $$LIBRTLSDRSRC/src/convenience/convenience.c -HEADERS = $$LIBRTLSDRSRC/include/rtl-sdr.h\ +HEADERS = $$LIBRTLSDRSRC/include/reg_field.h\ $$LIBRTLSDRSRC/include/rtl-sdr_export.h\ - $$LIBRTLSDRSRC/src/getopt/getopt.h + $$LIBRTLSDRSRC/include/rtlsdr_i2c.h\ + $$LIBRTLSDRSRC/include/rtlsdr_rpc_msg.h\ + $$LIBRTLSDRSRC/include/rtlsdr_rpc.h\ + $$LIBRTLSDRSRC/include/rtl-sdr.h\ + $$LIBRTLSDRSRC/include/tuner_e4k.h\ + $$LIBRTLSDRSRC/include/tuner_fc0012.h\ + $$LIBRTLSDRSRC/include/tuner_fc0013.h\ + $$LIBRTLSDRSRC/include/tuner_fc2580.h\ + $$LIBRTLSDRSRC/include/tuner_r82xx.h\ + $$LIBRTLSDRSRC/src/getopt/getopt.h\ + $$LIBRTLSDRSRC/src/convenience/convenience.h CONFIG(MINGW32):LIBS += -LD:\softs\libusb-1.0.20\MinGW32\dll -llibusb-1.0 CONFIG(MINGW64):LIBS += -LD:\softs\libusb-1.0.20\MinGW64\dll -llibusb-1.0