Windows build updates

This commit is contained in:
f4exb 2019-03-13 01:08:53 +01:00
parent f76ed4a466
commit ee7c2cee0d
6 changed files with 16 additions and 14 deletions

View File

@ -25,7 +25,6 @@ CONFIG(MINGW64):LIBBLADERF = "C:\Programs\bladeRF"
CONFIG(MINGW32):LIBHACKRFSRC = "C:\softs\hackrf\host"
CONFIG(MINGW64):LIBHACKRFSRC = "C:\softs\hackrf\host"
CONFIG(MSVC):LIBHACKRFSRC = "C:\softs\hackrf\host"
CONFIG(MINGW32):LIBLIMESUITESRC = "C:\softs\LimeSuite"
CONFIG(MINGW64):LIBLIMESUITESRC = "C:\softs\LimeSuite"
@ -249,7 +248,7 @@ MINGW32 || MINGW64 {
}
MSVC {
LIBS += -L../libhackrf/$${build_subdir} -llibhackrf
LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lhackrf
LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lbladeRF
LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lLimeSuite
LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lSoapySDR

View File

@ -10,6 +10,7 @@ TEMPLATE = lib
TARGET = mbelib
CONFIG(MSVC):DEFINES += mbelib_EXPORTS
CONFIG(MSVC):DEFINES += _USE_MATH_DEFINES
CONFIG(MINGW32):LIBMBELIBSRC = "C:\softs\mbelib"
CONFIG(MINGW64):LIBMBELIBSRC = "C:\softs\mbelib"
@ -34,5 +35,5 @@ $$LIBMBELIBSRC/ambe3600x2450_const.h\
$$LIBMBELIBSRC/ecc_const.h\
$$LIBMBELIBSRC/imbe7200x4400_const.h\
$$LIBMBELIBSRC/mbelib.h\
$$LIBMBELIBSRC/export.h\
$$LIBMBELIBSRC/mbelib_export.h\
$$LIBMBELIBSRC/mbelib_const.h

View File

@ -26,7 +26,7 @@ CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
CONFIG(MSVC):INCLUDEPATH += "C:\softs\ffmpeg-20181127-1035206-win64-dev\include"
CONFIG(MSVC):INCLUDEPATH += "C:\softs\ffmpeg-20190308-9645147-win64-dev\include"
CONFIG(macx):INCLUDEPATH += "../../../../../boost_1_69_0"
SOURCES += datvdemod.cpp\
@ -60,6 +60,6 @@ FORMS += datvdemodgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
#LIBS += -lavutil -lswscale -lavdevice -lavformat -lavcodec -lswresample
LIBS += -L"C:\softs\ffmpeg-20181127-1035206-win64-dev\lib" -lavutil -lswscale -lavdevice -lavformat -lavcodec -lswresample
LIBS += -L"C:\softs\ffmpeg-20190308-9645147-win64-dev\lib" -lavutil -lswscale -lavdevice -lavformat -lavcodec -lswresample
RESOURCES = ../../../sdrbase/resources/res.qrc
RESOURCES = ../../../sdrgui/resources/res.qrc

View File

@ -18,7 +18,6 @@ QMAKE_CXXFLAGS += -msse4.1
QMAKE_CXXFLAGS += -std=c++11
CONFIG(MINGW32):LIBHACKRFSRC = "C:\softs\hackrf\host"
CONFIG(MSVC):LIBHACKRFSRC = "C:\softs\hackrf\host"
CONFIG(macx):LIBHACKRFSRC = "/opt/local/include"
INCLUDEPATH += $$PWD
@ -27,7 +26,8 @@ INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
INCLUDEPATH += ../../../devices
INCLUDEPATH += $$LIBHACKRFSRC
CONFIG(!MSVC):INCLUDEPATH += $$LIBHACKRFSRC
CONFIG(MSVC):INCLUDEPATH += "C:\Program Files\PothosSDR\include"
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -49,7 +49,8 @@ FORMS += hackrfoutputgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
LIBS += -L../../../swagger/$${build_subdir} -lswagger
LIBS += -L../../../libhackrf/$${build_subdir} -llibhackrf
CONFIG(!MSVC):LIBS += -L../../../libhackrf/$${build_subdir} -llibhackrf
CONFIG(MSVC):LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lhackrf
LIBS += -L../../../devices/$${build_subdir} -ldevices
macx {
LIBS -= -L../../../libhackrf/$${build_subdir} -llibhackrf

View File

@ -18,7 +18,6 @@ QMAKE_CXXFLAGS += -msse4.1
QMAKE_CXXFLAGS += -std=c++11
CONFIG(MINGW32):LIBHACKRFSRC = "C:\softs\hackrf\host"
CONFIG(MSVC):LIBHACKRFSRC = "C:\softs\hackrf\host"
CONFIG(macx):LIBHACKRFSRC = "/opt/local/include"
INCLUDEPATH += $$PWD
@ -27,7 +26,8 @@ INCLUDEPATH += ../../../sdrbase
INCLUDEPATH += ../../../sdrgui
INCLUDEPATH += ../../../swagger/sdrangel/code/qt5/client
INCLUDEPATH += ../../../devices
INCLUDEPATH += $$LIBHACKRFSRC
CONFIG(!MSVC):INCLUDEPATH += $$LIBHACKRFSRC
CONFIG(MSVC):INCLUDEPATH += "C:\Program Files\PothosSDR\include"
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
@ -49,7 +49,8 @@ FORMS += hackrfinputgui.ui
LIBS += -L../../../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../../../sdrgui/$${build_subdir} -lsdrgui
LIBS += -L../../../swagger/$${build_subdir} -lswagger
LIBS += -L../../../libhackrf/$${build_subdir} -llibhackrf
CONFIG(!MSVC):LIBS += -L../../../libhackrf/$${build_subdir} -llibhackrf
CONFIG(MSVC):LIBS += -L"C:\Program Files\PothosSDR\bin" -L"C:\Program Files\PothosSDR\lib" -lhackrf
LIBS += -L../../../devices/$${build_subdir} -ldevices
macx {
LIBS -= -L../../../libhackrf/$${build_subdir} -llibhackrf

View File

@ -19,8 +19,8 @@ CONFIG(!MSVC):SUBDIRS += fcdhid
CONFIG(!MSVC):SUBDIRS += fcdlib
SUBDIRS += libairspy
SUBDIRS += libairspyhf
#SUBDIRS += libbladerf
SUBDIRS += libhackrf
CONFIG(!MSVC)SUBDIRS += libbladerf
CONFIG(!MSVC)SUBDIRS += libhackrf
CONFIG(!MSVC):SUBDIRS += libiio
CONFIG(!MSVC):SUBDIRS += liblimesuite
CONFIG(!MSVC):SUBDIRS += libperseus