mirror of https://github.com/f4exb/sdrangel.git
Windows build: re-implement nanomsg and sdrdaemon plugin for 64 bit version only. Created a batch installation script for Win64
This commit is contained in:
Edouard Griffiths
parent
85aa51f341
commit
1f758bc5f7
|
|
@ -199,7 +199,7 @@ You should take note that the Windows scheduler is just a piece of crap and not
|
|||
|
||||
There are no plugins for both flavours of Funcubes since it uses Alsa interface which is Linux exclusively. Changing for the Qt audio portable interface instead could be a solution that will be investigated in the future.
|
||||
|
||||
The SDRdaemon plug-in has been removed since version 1.1.4 in fact it is present only in version 1.1.3. It was not working well anyway mainly due to the fact that it needs an OS with a decent scheduler and Windows is definitely not this sort of OS (see my previous warning). With the implementation of the remote control of the SDRdaemon instance it is not working at all. I don't want to bother anymore with this. For now on it will be present in the Linux version on;y where it works beautifully.
|
||||
The SDRdaemon plug-in is present only in the 64 bit build version since version 1.1.4. The messaging system based on nanomsg works only in the 64 bit environment. However please be aware that the SDRdaemon plugin is not working well mainly due to the fact that it needs an OS with a decent scheduler and Windows is definitely not this sort of OS (see my previous warning). In fact depending on the case your mileage may vary however the Linux version works always beautifully so you know the options if you really want to use it!
|
||||
|
||||
<h3>Build environment</h3>
|
||||
|
||||
|
|
@ -323,7 +323,9 @@ It is possible to use a MinGW64 tool-chain by following these steps:
|
|||
- You should now be able to use this "kit" for your build
|
||||
- In the "Build steps" section add `CONFIG+=MINGW64` in the "Additional arguments"
|
||||
|
||||
The final packaging in a similar way to the MinGW32 build does not seem to work. Presently it is only possible to run it from Qt Creator copying the .dll files close to the `sdrangel.exe` file in the build tree. Therefore this build is considered experimental and not provided in the releases.
|
||||
Use the `windeployqt.exe` of the MSys2 distribution to copy the base files to your target installation directory in a similar way as this is done for MinGW32 (see above).
|
||||
|
||||
The final packaging is done with the `windows64.install.bat` utility. Assuming `D:\development\sdrangel` is the root directory of your cloned source repository, `D:\msys64` is the installation directory of MSys2, `D:\libusb-1.0.19\MinGW64` is your libusb installation directory and `D:\Programs\sdrangel64` is your target installation directory do: `D:\development\sdrangel\windows64.install.bat release D:\Programs\sdrangel`. Modify the script if your MSys2 and libusb locations are different.
|
||||
|
||||
<h1>Android</h1>
|
||||
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ TEMPLATE = lib
|
|||
TARGET = nanomsg
|
||||
|
||||
CONFIG(MINGW32):LIBNANOMSGSRC = "D:\softs\nanomsg-0.8-beta"
|
||||
CONFIG(MINGW64):LIBNANOMSGSRC = "D:\softs\nanomsg-0.8-beta"
|
||||
|
||||
CONFIG(MINGW32):DEFINES += NN_HAVE_WINDOWS=1
|
||||
CONFIG(MINGW32):DEFINES += _CRT_SECURE_NO_WARNINGS=1
|
||||
|
|
@ -18,6 +19,14 @@ CONFIG(MINGW32):DEFINES += NN_HAVE_STDINT=1
|
|||
CONFIG(MINGW32):DEFINES += _WIN32_WINNT=0x0600
|
||||
CONFIG(MINGW32):DEFINES += NN_EXPORTS=1
|
||||
|
||||
CONFIG(MINGW64):DEFINES += NN_HAVE_WINDOWS=1
|
||||
CONFIG(MINGW64):DEFINES += _CRT_SECURE_NO_WARNINGS=1
|
||||
CONFIG(MINGW64):DEFINES += NN_HAVE_MINGW=1
|
||||
CONFIG(MINGW64):DEFINES += NN_HAVE_STDINT=1
|
||||
CONFIG(MINGW64):DEFINES += _WIN32_WINNT=0x0600
|
||||
CONFIG(MINGW64):DEFINES += NN_EXPORTS=1
|
||||
CONFIG(MINGW64):DEFINES += _POSIX_C_SOURCE=1
|
||||
|
||||
INCLUDEPATH += $$LIBNANOMSGSRC/src
|
||||
|
||||
SOURCES = $$LIBNANOMSGSRC/src/core/ep.c\
|
||||
|
|
@ -263,3 +272,4 @@ $$LIBNANOMSGSRC/src/transports/utils/dns_getaddrinfo_a.inc
|
|||
|
||||
#CONFIG(MINGW32):LIBS += -lws2_32 -lmswsock -ladvapi32
|
||||
CONFIG(MINGW32):LIBS += -lws2_32 -lmswsock
|
||||
CONFIG(MINGW64):LIBS += -lws2_32 -lmswsock
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ QT += core gui widgets multimedia network
|
|||
TARGET = inputsdrdaemon
|
||||
|
||||
CONFIG(MINGW32):LIBNANOMSGSRC = "D:\softs\nanomsg-0.8-beta"
|
||||
CONFIG(MINGW64):LIBNANOMSGSRC = "D:\softs\nanomsg-0.8-beta"
|
||||
|
||||
INCLUDEPATH += $$PWD
|
||||
INCLUDEPATH += ../../../sdrbase
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
TEMPLATE = subdirs
|
||||
SUBDIRS = sdrbase
|
||||
SUBDIRS += lz4
|
||||
#SUBDIRS += nanomsg
|
||||
CONFIG(MINGW64)SUBDIRS += nanomsg
|
||||
SUBDIRS += fcdhid
|
||||
SUBDIRS += fcdlib
|
||||
SUBDIRS += librtlsdr
|
||||
|
|
@ -15,7 +15,7 @@ SUBDIRS += libhackrf
|
|||
SUBDIRS += libairspy
|
||||
SUBDIRS += libbladerf
|
||||
SUBDIRS += plugins/samplesource/filesource
|
||||
#SUBDIRS += plugins/samplesource/sdrdaemon
|
||||
CONFIG(MINGW64)SUBDIRS += plugins/samplesource/sdrdaemon
|
||||
SUBDIRS += plugins/samplesource/rtlsdr
|
||||
SUBDIRS += plugins/samplesource/hackrf
|
||||
SUBDIRS += plugins/samplesource/airspy
|
||||
|
|
|
|||
Loading…
Reference in New Issue