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

Windows: MSVC2017: changes in sdrbase (3) serialdv

Browse Source
This commit is contained in:
f4exb 2018-11-12 17:22:19 +01:00
parent 70a4db39c0
commit 64169bc168
5 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
exports/export.h
View File

@ -102,6 +102,18 @@
# define QRTPLIB_API
#endif
/* the 'SERIALDV_API' controls the import/export of 'serialdv' symbols
*/
#if !defined(sdrangel_STATIC)
# ifdef serialdv_EXPORTS
# define SERIALDV_API __SDR_EXPORT
# else
# define SERIALDV_API __SDR_IMPORT
# endif
#else
# define SERIALDV_API
#endif
/* the 'SWG_API' controls the import/export of 'swagger' symbols
*/
#if !defined(sdrangel_STATIC)

6
sdrbase/dsp/dvserialengine.cpp
View File

@ -16,14 +16,16 @@
///////////////////////////////////////////////////////////////////////////////////
#include <stdlib.h>
#include <dirent.h>
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
#include <fcntl.h>
#ifndef _MSC_VER
#include <dirent.h>
#include <unistd.h>
#include <libgen.h>
#endif
#ifndef __WINDOWS__
#include <termios.h>

5
sdrbase/dsp/dvserialworker.cpp
View File

@ -15,7 +15,8 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include <unistd.h>
#include <chrono>
#include <thread>
#include "dsp/dvserialworker.h"
#include "audio/audiofifo.h"
@ -60,7 +61,7 @@ void DVSerialWorker::process()
while (m_running)
{
sleep(1);
std::this_thread::sleep_for(std::chrono::seconds(1));
}
qDebug("DVSerialWorker::process: stopped");

5
sdrbase/sdrbase.pro
View File

@ -40,10 +40,11 @@ CONFIG(MSVC):INCLUDEPATH += "C:\softs\boost_1_66_0"
CONFIG(MINGW32):INCLUDEPATH += "C:\softs\serialDV"
CONFIG(MINGW64):INCLUDEPATH += "C:\softs\serialDV"
CONFIG(MSVC):INCLUDEPATH += "C:\softs\serialDV"
CONFIG(macx):INCLUDEPATH += "../../../boost_1_64_0"
MINGW32 || MINGW64 {
MINGW32 || MINGW64 || MSVC {
HEADERS += \
dsp/dvserialengine.h \
dsp/dvserialworker.h
@ -224,7 +225,7 @@ HEADERS += audio/audiodevicemanager.h\
webapi/webapiserver.h\
mainparser.h
MINGW32 || MINGW64 {
MINGW32 || MINGW64 || MSVC {
LIBS += -L../serialdv/$${build_subdir} -lserialdv
}
LIBS += -L../httpserver/$${build_subdir} -lhttpserver

4
serialdv/serialdv.pro
View File

@ -9,10 +9,14 @@ QT += core
TEMPLATE = lib
TARGET = serialdv
CONFIG(MSVC):DEFINES += serialdv_EXPORTS
CONFIG(MINGW32):LIBSERIALDVSRC = "C:\softs\serialDV"
CONFIG(MINGW64):LIBSERIALDVSRC = "C:\softs\serialDV"
CONFIG(MSVC):LIBSERIALDVSRC = "C:\softs\serialDV"
INCLUDEPATH += $$LIBSERIALDVSRC
INCLUDEPATH += ../exports
DEFINES += __WINDOWS__=1