From 05ec6d1074330249bf907dff09fde4b8d8b75943 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 17 Nov 2017 18:40:18 +0100 Subject: [PATCH] Windows build: catch up with recent updates --- sdrbase/sdrbase.pro | 14 +++++++++++--- sdrgui/sdrgui.pro | 2 ++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sdrbase/sdrbase.pro b/sdrbase/sdrbase.pro index fc725d506..ce2e6ce5c 100644 --- a/sdrbase/sdrbase.pro +++ b/sdrbase/sdrbase.pro @@ -4,12 +4,14 @@ # #-------------------------------------------------------- -QT += core gui multimedia opengl +QT += core multimedia greaterThan(QT_MAJOR_VERSION, 4): QT += widgets TEMPLATE = lib TARGET = sdrbase INCLUDEPATH += $$PWD +INCLUDEPATH += ../httpserver +INCLUDEPATH += ../swagger/sdrangel/code/qt5/client DEFINES += USE_KISSFFT=1 win32 { @@ -102,7 +104,9 @@ SOURCES += audio/audiodeviceinfo.cpp\ util/simpleserializer.cpp\ plugin/plugininterface.cpp\ plugin/pluginapi.cpp\ - plugin/pluginmanager.cpp + plugin/pluginmanager.cpp\ + webapi/webapirequestmapper.cpp\ + webapi/webapiserver.cpp HEADERS += audio/audiodeviceinfo.h\ audio/audiofifo.h\ @@ -178,9 +182,13 @@ HEADERS += audio/audiodeviceinfo.h\ util/prettyprint.h\ util/syncmessenger.h\ util/samplesourceserializer.h\ - util/simpleserializer.h + util/simpleserializer.h\ + webapi/webapiadapterinterface.h\ + webapi/webapirequestmapper.h\ + webapi/webapiserver.h !macx:LIBS += -L../serialdv/$${build_subdir} -lserialdv +LIBS += -L../httpserver/$${build_subdir} -lhttpserver CONFIG(ANDROID):CONFIG += mobility CONFIG(ANDROID):MOBILITY = diff --git a/sdrgui/sdrgui.pro b/sdrgui/sdrgui.pro index a56eb8118..d642d3e6b 100644 --- a/sdrgui/sdrgui.pro +++ b/sdrgui/sdrgui.pro @@ -12,6 +12,8 @@ TARGET = sdrgui INCLUDEPATH += $$PWD INCLUDEPATH += ../sdrbase INCLUDEPATH += ../logging +INCLUDEPATH += ../httpserver +INCLUDEPATH += ../swagger/sdrangel/code/qt5/client DEFINES += USE_KISSFFT=1 win32 {