Skip to content

Commit

Permalink
changes in pro files
Browse files Browse the repository at this point in the history
  • Loading branch information
@JvanKatwijk
JvanKatwijk committed Feb 27, 2024
1 parent 45e954d commit 591c264
Show file tree
Hide file tree
Showing 19 changed files with 330 additions and 137 deletions.
2 changes: 1 addition & 1 deletion qt-dab-6.5/appimage/AppRun
View file
Expand Up @@ -4,4 +4,4 @@ HERE="$(dirname "$(readlink -f "${0}")")"
# Try to run using sudo, if this does not work ask the user for password
#sudo -n -E -- "/tmp/udev-rules-helper" || pkexec "/tmp/udev-rules-helper"
#rm "/tmp/udev-rules-helper"
exec "${HERE}/usr/bin/qt-dab-6.5Beta" "$@"
exec "${HERE}/usr/bin/qt-dab-6.5" "$@"
0 qt-dab-6.5/qt-dab-RC-256x256.png → qt-dab-6.5/qt-dab-6.5-256x265.png
View file
File renamed without changes
12 changes: 6 additions & 6 deletions qt-dab-6.5/qt-dab-RC-build.txt → qt-dab-6.5/qt-dab-6.5-build.txt
View file
Expand Up @@ -5,13 +5,13 @@ mkdir -p ./appdir/usr/share/applications
mkdir -p ./appdir/usr/share/icons/hicolor/128x128/apps/
mkdir -p ./appdir/usr/share/icons/hicolor/256x256/apps/

cp linux-bin/qt-dab* appdir/usr/bin/qt-dab-6.5Beta
cp qt-dab-6.5Beta.desktop appdir/usr/share/applications
cp ../res/qt-dab-RC-256x256.png appdir/qt-dab-6.5Beta.png
cp ../res/qt-dab-RC-128x128.png appdir/usr/share/icons/hicolor/128x128/apps/
cp ../res/qt-dab-RC-256x256.png appdir/usr/share/icons/hicolor/256x256/apps/
cp linux-bin/qt-dab* appdir/usr/bin/qt-dab-6.5
cp qt-dab-6.5.desktop appdir/usr/share/applications
cp ../res/qt-dab-6.5-256x256.png appdir/qt-dab-6.5.png
cp ../res/qt-dab-6.5-128x128.png appdir/usr/share/icons/hicolor/128x128/apps/
cp ../res/qt-dab-6.5-256x256.png appdir/usr/share/icons/hicolor/256x256/apps/

touch appdir/qt-dab-RC.png
touch appdir/qt-dab-6.5.png

wget -c "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
chmod a+x linuxdeployqt*.AppImage
Expand Down
6 changes: 3 additions & 3 deletions qt-dab-6.5/qt-dab-6.5Beta.desktop → qt-dab-6.5/qt-dab-6.5.desktop
View file
@@ -1,7 +1,7 @@
[Desktop Entry]
Name=Qt_DAB-6.5Beta
Exec=qt-dab-6.5Beta
Icon=qt-dab-RC
Name=Qt_DAB-6.5
Exec=qt-dab-6.5
Icon=qt-dab-6.5
Type=Application
Categories=AudioVideo;
Comment=A DAB/DAB+ decoder using Qt and C++
0 qt-dab-6.5/qt-dab-RC.ico → qt-dab-6.5/qt-dab-6.5.ico
View file
File renamed without changes.
0 qt-dab-6.5/qt-dab-RC.png → qt-dab-6.5/qt-dab-6.5.png
View file
File renamed without changes
203 changes: 108 additions & 95 deletions qt-dab-6.5/qt-dab-6.5.pro
View file
Expand Up @@ -8,11 +8,10 @@ TEMPLATE = app
QT += widgets xml
#CONFIG += console
CONFIG -= console
QMAKE_CXXFLAGS += -std=c++17
CONFIG += release
QMAKE_CXXFLAGS += -std=c++14
win32 {
QMAKE_CFLAGS += -O4 -ffast-math
QMAKE_CXXFLAGS += -O4 -ffast-math
#QMAKE_CFLAGS += -O3 -ffast-math
#QMAKE_CXXFLAGS += -O3 -ffast-math
}
unix {
QMAKE_CXXFLAGS += -ffast-math -flto
Expand All @@ -27,16 +26,17 @@ QMAKE_LFLAGS += -ffast-math -flto
#QMAKE_CXXFLAGS += -pg
#QMAKE_LFLAGS += -pg
QMAKE_CXXFLAGS += -isystem $$[QT_INSTALL_HEADERS]
RC_ICONS = qt-dab-RC.ico
RC_ICONS = qt-dab-6.5.ico
RESOURCES += resources.qrc

TRANSLATIONS = ../i18n/de_DE.ts

DEFINES += __HAS_CHANNEL__
#DEFINES += __ESTIMATOR__
#
# For more parallel processing, uncomment the following
# defines
#DEFINES += __MSC_THREAD__
DEFINES += __THREADED_BACKEND__
DEFINES += __THREADED_BACKEND__

#DEFINES += _UPLOAD_SCAN_RESULT_

Expand Down Expand Up @@ -77,8 +77,8 @@ DEPENDPATH += . \
../includes/support/buttons \
../includes/scopes-qwt6 \
../qt-devices \
../qt-devices/filereaders \
../qt-devices/filereaders/rawfiles-new \
../qt-devices/filereaders/ \
../qt-devices/filereaders//rawfiles-new \
../qt-devices/filereaders/wavfiles-new\
../qt-devices/filereaders/xml-filereader

Expand Down Expand Up @@ -111,7 +111,7 @@ INCLUDEPATH += . \
../qt-devices/filereaders \
../qt-devices/filereaders/rawfiles-new \
../qt-devices/filereaders/wavfiles-new \
../qt-devices/filereaders/xml-filereader
../qt-devices/filereaders/xml-filereader \

# Input
HEADERS += ./radio.h \
Expand Down Expand Up @@ -193,8 +193,8 @@ HEADERS += ./radio.h \
../includes/output/audio-player.h \
../includes/output/audiosink.h \
../includes/support/distances.h \
../includes/support/cacheElement.h \
../includes/support/settingNames.h \
../includes/support/cacheElement.h \
../includes/support/settingnames.h \
../includes/support/fft-handler.h \
../includes/support/converter_48000.h \
../includes/support/process-params.h \
Expand Down Expand Up @@ -373,7 +373,7 @@ SOURCES += ./main.cpp \
#
unix {
DESTDIR = ./linux-bin
TARGET = qt-dab-6.40
TARGET = qt-dab-6.5
exists ("../.git") {
GITHASHSTRING = $$system(git rev-parse --short HEAD)
!isEmpty(GITHASHSTRING) {
Expand Down Expand Up @@ -425,8 +425,8 @@ CONFIG += sdrplay-v2
CONFIG += sdrplay-v3
CONFIG += dabstick-linux
CONFIG += rtl_tcp
CONFIG += airspy
CONFIG += hackrf
CONFIG += airspy-2
#CONFIG += hackrf
CONFIG += lime
CONFIG += soapy
#CONFIG += pluto-rxtx
Expand Down Expand Up @@ -472,60 +472,73 @@ isEmpty(GITHASHSTRING) {
DEFINES += GITHASH=\\\"------\\\"
}

#for for 64 bit
TARGET = qt-dab64-6.50
DEFINES += __BITS64__
DESTDIR = /usr/shared/w64-programs/windows-dab64-qt
INCLUDEPATH += /usr/x64-w64-mingw32/sys-root/mingw/include
INCLUDEPATH += /usr/local/include /usr/include/qt4/qwt /usr/include/qt5/qwt /usr/include/qt4/qwt /usr/include/qwt /usr/local/qwt-6.1.4-svn/
LIBS += -L/usr/x64-w64-mingw32/sys-root/mingw/lib
##for for 64 bit
# TARGET = qt-dab64-6.5
# DEFINES += __BITS64__
# DESTDIR = /usr/shared/w64-programs/windows-dab64-qt
# INCLUDEPATH += /usr/x64-w64-mingw32/sys-root/mingw/include
# INCLUDEPATH += /usr/local/include /usr/include/qt4/qwt /usr/include/qt5/qwt /usr/include/qt4/qwt /usr/include/qwt /usr/local/qwt-6.1.4-svn/
# LIBS += -L/usr/x64-w64-mingw32/sys-root/mingw/lib
## LIBS += -liio
CONFIG += airspy
CONFIG += spyServer-16
CONFIG += spyServer-8
## #CONFIG += extio
# CONFIG += airspy-2
# CONFIG += rtl_tcp
# CONFIG += dabstick
# CONFIG += sdrplay-v2
# CONFIG += pluto
# CONFIG += sdrplay-v3
## CONFIG += hackrf
## CONFIG += lime
# CONFIG += NO_SSE
# DEFINES += __THREADED_BACKEND
#
#for win32, comment out the lines above
# TARGET = qt-dab32-6.5V3
# CONFIG += dabstick-win-v3
TARGET = qt-dab32-6.5
CONFIG += dabstick-win-v4
CONFIG += airspy-2
CONFIG += spyServer-16
CONFIG += spyServer-8
DESTDIR = /usr/shared/w32-programs/windows-dab32-qt
INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include
INCLUDEPATH += /usr/i686-w64-mingw32/sys-root/mingw/include/qt5/qwt
LIBS += -L/usr/i686-w64-mingw32/sys-root/mingw/lib
CONFIG += double
#CONFIG += single
CONFIG += mapserver
CONFIG += extio
CONFIG += rtl_tcp
CONFIG += dabstick-win64
CONFIG += sdrplay-v2
CONFIG += sdrplay
CONFIG += pluto
CONFIG += sdrplay-v3
CONFIG += hackrf
CONFIG += lime
DEFINES += __THREADED_BACKEND
INCLUDEPATH += ../../TII-CODES
HEADERS += ../../TII-CODES/tii-reader.h
HEADERS += ../../TII-CODES/db-loader.h
SOURCES += ../../TII-CODES/tii-reader.cpp
SOURCES += ../../TII-CODES/db-loader.cpp
CONFIG += double
#CONFIG += single
CONFIG += mapserver
HEADERS += ../src/support/viterbi-spiral/spiral-no-sse.h
SOURCES += ../src/support/viterbi-spiral/spiral-no-sse.c
LIBS += /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libcurl-4.dll
LIBS += /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libsndfile-1.dll
LIBS += /usr/x86_64-w64-mingw32/sys-root/mingw/bin/libsamplerate-0.dll
LIBS += -lportaudio
CONFIG += pluto
# CONFIG += pluto-rxtx
CONFIG += NO_SSE
CONFIG += preCompiled
# CONFIG += tiiLib
#
INCLUDEPATH += /usr/local/include
LIBS += -lportaudio
#LIBS += /usr/i686-w64-mingw32/sys-root/mingw/bin/libsndfile-1.dll
#LIBS += /usr/i686-w64-mingw32/sys-root/mingw/bin/libsamplerate-0.dll
#LIBS += -lole32
LIBS += -lwinpthread
LIBS += -lwinmm
LIBS += -lstdc++
LIBS += -lws2_32
LIBS += -lusb-1.0
LIBS += -lz
# end of 32/64 specifics
INCLUDEPATH += /usr/local/include
LIBS += -lportaudio
LIBS += /usr/i686-w64-mingw32/sys-root/mingw/bin/libsndfile-1.dll
LIBS += /usr/i686-w64-mingw32/sys-root/mingw/bin/libsamplerate-0.dll
LIBS += -lole32
LIBS += -lwinpthread
LIBS += -lwinmm
LIBS += -lstdc++
LIBS += -lws2_32
LIBS += -lusb-1.0
LIBS += -lz
#correct this for the correct path to the qwt6 library on your system
#mingw64 wants the first one, cross compiling mingw64-32 the second one
#LIBS += -lqwt
LIBS += -lqwt-qt5
CONFIG += faad
#LIBS += -lqwt
LIBS += -lqwt-qt5
CONFIG += faad
#
#very experimental, simple server for connecting to a tdc handler
# CONFIG += datastreamer
#CONFIG += datastreamer

#if you want to listen remote, uncomment
#CONFIG += tcp-streamer # use for remote listening
Expand Down Expand Up @@ -560,21 +573,7 @@ dabstick-win-v4 {
SOURCES += ../qt-devices/rtlsdr-handler-win-v4/rtlsdr-handler-v4.cpp \
../qt-devices/rtlsdr-handler-common/rtl-dongleselect.cpp
FORMS += ../qt-devices/rtlsdr-handler-common/rtlsdr-widget.ui
# LIBS += /usr/i686-s64-mingw32/sys-root/mingw/bin/librtlsdr.dll
LIBS += /usr/shared/drivers/rtlsdr-drivers-windows/x86/librtlsdr.dll
}

dabstick-win64 {
DEFINES += HAVE_RTLSDR_V4
DEPENDPATH += ../qt-devices/rtlsdr-handler-win-v4
INCLUDEPATH += ../qt-devices/rtlsdr-handler-win-v4
INCLUDEPATH += ../qt-devices/rtlsdr-handler-common
HEADERS += ../qt-devices/rtlsdr-handler-win-v4/rtlsdr-handler-v4.h \
../qt-devices/rtlsdr-handler-common/rtl-dongleselect.h
SOURCES += ../qt-devices/rtlsdr-handler-win-v4/rtlsdr-handler-v4.cpp \
../qt-devices/rtlsdr-handler-common/rtl-dongleselect.cpp
FORMS += ../qt-devices/rtlsdr-handler-common/rtlsdr-widget.ui
LIBS += /usr/shared/drivers/rtlsdrWindowsV4/x64/rtlsdr.a
LIBS += /usr/shared/drivers/rtlsdrWindowsV4/x86/rtlsdr.dll
}

dabstick-win-v3 {
Expand Down Expand Up @@ -626,7 +625,7 @@ sdrplay-v3 {
../qt-devices/sdrplay-handler-v3/RspDuo-handler.cpp \
../qt-devices/sdrplay-handler-v3/RspDx-handler.cpp
FORMS += ../qt-devices/sdrplay-handler-v3/sdrplay-widget-v3.ui
# LIBS += -ldl
LIBS += -ldl
}
#
# limeSDR
Expand Down Expand Up @@ -667,6 +666,19 @@ airspy {
FORMS += ../qt-devices/airspy-handler/airspy-widget.ui
}

airspy-2 {
DEFINES += HAVE_AIRSPY_2
DEPENDPATH += ../qt-devices/airspy-2
INCLUDEPATH += ../qt-devices/airspy-2 \
../qt-devices/airspy-2/libairspy
HEADERS += ../qt-devices/airspy-2/airspy-2.h \
../qt-devices/airspy-2/airspyselect.h \
../qt-devices/airspy-2/libairspy/airspy.h
SOURCES += ../qt-devices/airspy-2/airspy-2.cpp \
../qt-devices/airspy-2/airspyselect.cpp
FORMS += ../qt-devices/airspy-2/airspy-widget.ui
}

# extio dependencies, windows only
#
extio {
Expand Down Expand Up @@ -858,6 +870,8 @@ PC {
}

NO_SSE {
HEADERS += ../src/support/viterbi-spiral/spiral-no-sse.h
SOURCES += ../src/support/viterbi-spiral/spiral-no-sse.c
}

faad {
Expand All @@ -876,29 +890,28 @@ fdk-aac {
}

preCompiled {
win32 {
LIBS += /usr/i686-w64-mingw32/sys-root/mingw/bin/libcurl-4.dll
}
unix {
LIBS += -lcurl
}
# INCLUDEPATH += /home/jan/curl
INCLUDEPATH += ../../TII-CODES
HEADERS += ../../TII-CODES/tii-reader.h
HEADERS += ../../TII-CODES/db-loader.h
SOURCES += ../../TII-CODES/tii-reader.cpp
SOURCES += ../../TII-CODES/db-loader.cpp

}

tiiLib {
INCLUDEPATH += ../src/support/tii-library
HEADERS += ../src/support/tii-library/tii-reader.h
HEADERS += ../src/support/tii-library/db-loader.h
SOURCES += ../src/support/tii-library/tii-reader.cpp
SOURCES += ../src/support/tii-library/db-loader.cpp
win32 {
LIBS += /usr/i686-w64-mingw32/sys-root/mingw/bin/libcurl-4.dll
}
unix {
LIBS += -lcurl
}
# INCLUDEPATH += /home/jan/curl
INCLUDEPATH += ../../TII-CODES
HEADERS += ../../TII-CODES/tii-reader.h
HEADERS += ../../TII-CODES/db-loader.h
SOURCES += ../../TII-CODES/tii-reader.cpp
SOURCES += ../../TII-CODES/db-loader.cpp

}

tiiLib {
INCLUDEPATH += ../src/support/tii-library
HEADERS += ../src/support/tii-library/tii-reader.h
HEADERS += ../src/support/tii-library/db-loader.h
SOURCES += ../src/support/tii-library/tii-reader.cpp
SOURCES += ../src/support/tii-library/db-loader.cpp
}

mapserver {
DEFINES += __HAVE_MAP_SERVER__
Expand Down
2 changes: 1 addition & 1 deletion qt-dab-6.5/qt-dab-6.5.pro-32
View file
Expand Up @@ -26,7 +26,7 @@ QMAKE_LFLAGS += -ffast-math -flto
#QMAKE_CXXFLAGS += -pg
#QMAKE_LFLAGS += -pg
QMAKE_CXXFLAGS += -isystem $$[QT_INSTALL_HEADERS]
RC_ICONS = qt-dab-RC.ico
RC_ICONS = qt-dab-6.5.ico
RESOURCES += resources.qrc

TRANSLATIONS = ../i18n/de_DE.ts
Expand Down
4 changes: 3 additions & 1 deletion qt-dab-6.5/qt-dab-6.5.pro-64
View file
Expand Up @@ -27,7 +27,7 @@ QMAKE_LFLAGS += -ffast-math -flto
#QMAKE_CXXFLAGS += -pg
#QMAKE_LFLAGS += -pg
QMAKE_CXXFLAGS += -isystem $$[QT_INSTALL_HEADERS]
RC_ICONS = qt-dab-RC.ico
RC_ICONS = qt-dab-6.5.ico
RESOURCES += resources.qrc

TRANSLATIONS = ../i18n/de_DE.ts
Expand Down Expand Up @@ -616,12 +616,14 @@ sdrplay-v3 {
../qt-devices/sdrplay-handler-v3/sdrplay-commands.h \
../qt-devices/sdrplay-handler-v3/Rsp-device.h \
../qt-devices/sdrplay-handler-v3/Rsp1A-handler.h \
../qt-devices/sdrplay-handler-v3/RspI-handler.h \
../qt-devices/sdrplay-handler-v3/RspII-handler.h \
../qt-devices/sdrplay-handler-v3/RspDuo-handler.h \
../qt-devices/sdrplay-handler-v3/RspDx-handler.h
SOURCES += ../qt-devices/sdrplay-handler-v3/Rsp-device.cpp \
../qt-devices/sdrplay-handler-v3/sdrplay-handler-v3.cpp \
../qt-devices/sdrplay-handler-v3/Rsp1A-handler.cpp \
../qt-devices/sdrplay-handler-v3/RspI-handler.cpp \
../qt-devices/sdrplay-handler-v3/RspII-handler.cpp \
../qt-devices/sdrplay-handler-v3/RspDuo-handler.cpp \
../qt-devices/sdrplay-handler-v3/RspDx-handler.cpp
Expand Down
2 changes: 1 addition & 1 deletion qt-dab-6.5/resources.qrc
View file
@@ -1,7 +1,7 @@
<RCC>
<qresource prefix="/">
<file>../i18n/de_DE.qm</file>
<file>qt-dab-RC.ico</file>
<file>qt-dab-6.5.ico</file>
<file>../AUTHORS</file>
<file>../COPYING</file>
<file>../res/pauze-slide.png</file>
Expand Down

0 comments on commit 591c264

Please sign in to comment.