diff --git a/README.md b/README.md index 4b6464ef..ab41d783 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ Table of contents * [Ubuntu Linux 16.04 LTS](#ubuntu-linux-1604-lts) * [Windows 10](#windows-10) * [Raspberry Pi 2 and 3](#raspberry-pi-2-and-3) + * [Limitations](#limitations) Usage ===== @@ -109,43 +110,8 @@ This sections shows how to compile welle.io with GUI_3 on Windows 10. Windows 7 1. Install QT 5.7 including the QT Charts and mingw modules by using the the "Qt Online Installer for Windows" https://www.qt.io/download-open-source/ 2. Clone welle.io https://github.com/AlbrechtL/welle.io.git e.g. by using [TortoiseGit](https://tortoisegit.org). -3. Clone the welle.io Windows libraries https://github.com/AlbrechtL/dab-rpi_win_libs.git. +3. Clone the welle.io Windows libraries https://github.com/AlbrechtL/welle.io-win-libs.git. 4. Start QT Creator and open the project file "welle.io.pro" inside the folder "welle.io". -5. Edit "welle.io.pro" and adapt it to your needs. This example is tested with the following settings: - - ``` -win32 { -DESTDIR = ../windows-bin-dab -# includes in mingw differ from the includes in fedora linux -#INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include -INCLUDEPATH += ../dab-rpi_win_libs/include -LIBS += -L/usr/i686-w64-mingw32/sys-root/mingw/lib -LIBS += -L../dab-rpi_win_libs/x86 -LIBS += -lfftw3f-3 -LIBS += -lportaudio_x86 -LIBS += -llibsndfile-1 -LIBS += -lole32 -LIBS += -lwinpthread -LIBS += -lwinmm -LIBS += -lstdc++ -LIBS += -lws2_32 -LIBS += -llibfaad -LIBS += -lusb-1.0 -LIBS += -llibsamplerate -LIBS += -lzlib -CONFIG += NO_SSE_SUPPORT -#CONFIG += extio -#CONFIG += airspy -#CONFIG += airspy-exp -CONFIG += rtl_tcp -CONFIG += dabstick -#CONFIG += sdrplay -#CONFIG += tcp-streamer -#CONFIG += rtp-streamer -CONFIG += gui_3 -} - ``` - 6. Build welle.io 7. Run welle.io and enjoy it @@ -153,4 +119,8 @@ Raspberry Pi 2 and 3 --- To build and run dap-rpi with GUI_3 on a Raspberry Pi 2 and 3 with GPU acceleration, please visit this repository: https://github.com/AlbrechtL/dab-rpi_raspbian_image - +Limitation +=== +* CMake is not tested +* DAB is not tested (only DAB+ is tested) +* sdrplay and airspy SDR devices are not tested diff --git a/welle.io.pro b/welle.io.pro index 7e946b99..8e6c6142 100644 --- a/welle.io.pro +++ b/welle.io.pro @@ -8,12 +8,12 @@ TEMPLATE = app TARGET = welle.io QT += widgets network CONFIG += console -QMAKE_CFLAGS += -flto -ffast-math -QMAKE_CXXFLAGS += -flto -ffast-math -QMAKE_LFLAGS += -flto -#QMAKE_CFLAGS += -g -#QMAKE_CXXFLAGS += -g -#QMAKE_LFLAGS += -g +Relase: QMAKE_CFLAGS += -flto -ffast-math -O3 +Relase: QMAKE_CXXFLAGS += -flto -ffast-math -O3 +Relase: QMAKE_LFLAGS += -flto -O3 +#Debug: QMAKE_CFLAGS += -g +#Debug: QMAKE_CXXFLAGS += -g +#Debug: QMAKE_LFLAGS += -g DEPENDPATH += . \ ./src \ ./includes \ @@ -181,29 +181,27 @@ LIBS += -lfaad # # an attempt to have it run under W32 win32 { -DESTDIR = ../../windows-bin -# includes in mingw differ from the includes in fedora linux -INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include -LIBS += -L/usr/i686-w64-mingw32/sys-root/mingw/lib -LIBS += -lfftw3f -LIBS += -lportaudio -LIBS += -lsndfile -LIBS += -lsamplerate +INCLUDEPATH += ../welle.io-win-libs/include +LIBS += -L../welle.io-win-libs/x86 +LIBS += -lfftw3f-3 +LIBS += -lportaudio_x86 +LIBS += -llibsndfile-1 LIBS += -lole32 LIBS += -lwinpthread LIBS += -lwinmm LIBS += -lstdc++ LIBS += -lws2_32 -LIBS += -lfaad +LIBS += -llibfaad LIBS += -lusb-1.0 -LIBS += -lz +LIBS += -llibsamplerate +LIBS += -lzlib CONFIG += extio CONFIG += airspy CONFIG += rtl_tcp CONFIG += dabstick CONFIG += sdrplay-exp #CONFIG += tcp-streamer -CONFIG += gui_1 +CONFIG += gui_3 } ####################################### @@ -235,7 +233,7 @@ gui_2 { gui_3 { - TARGET = dab-rpi-touch + TARGET = welle-io DEFINES += GUI_3 QT += qml quick charts INCLUDEPATH += ./gui_3