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

Logging: Windows build

Browse Source
This commit is contained in:
f4exb 2017-11-12 03:00:54 +01:00
parent 6556096a63
commit 715222365f
5 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
logging/logging.pro Normal file
View File

@ -0,0 +1,35 @@
#--------------------------------------------------------
#
# Pro file for Android and Windows builds with Qt Creator
#
#--------------------------------------------------------
QT += core
TEMPLATE = lib
TARGET = logging
INCLUDEPATH += $$PWD
QMAKE_CXXFLAGS += -std=c++11
CONFIG(Release):build_subdir = release
CONFIG(Debug):build_subdir = debug
# Enable very detailed debug messages when compiling the debug version
CONFIG(debug, debug|release) {
DEFINES += SUPERVERBOSE
}
HEADERS += $$PWD/logglobal.h \
$$PWD/logmessage.h \
$$PWD/logger.h \
$$PWD/filelogger.h \
$$PWD/dualfilelogger.h \
$$PWD/loggerwithfile.h
SOURCES += $$PWD/logmessage.cpp \
$$PWD/logger.cpp \
$$PWD/filelogger.cpp \
$$PWD/dualfilelogger.cpp \
$$PWD/loggerwithfile.cpp

2
logging/logmessage.cpp
View File

@ -68,7 +68,7 @@ QString LogMessage::toString(const QString& msgFormat, const QString& timestampF
decorated.replace("{line}",QString::number(line));
QString threadId;
threadId.setNum((unsigned long)QThread::currentThreadId());
threadId.setNum((std::size_t)QThread::currentThreadId());
decorated.replace("{thread}",threadId);
// Fill in variables

5
sdrgui/sdrgui.pro
View File

@ -11,6 +11,7 @@ TEMPLATE = lib
TARGET = sdrgui
INCLUDEPATH += $$PWD
INCLUDEPATH += ../sdrbase
INCLUDEPATH += ../logging
DEFINES += USE_KISSFFT=1
win32 {
@ -61,6 +62,7 @@ SOURCES += mainwindow.cpp\
gui/glspectrumgui.cpp\
gui/indicator.cpp\
gui/levelmeter.cpp\
gui/loggingdialog.cpp\
gui/pluginsdialog.cpp\
gui/audiodialog.cpp\
gui/presetitem.cpp\
@ -106,6 +108,7 @@ HEADERS += mainwindow.h\
gui/glspectrumgui.h\
gui/indicator.h\
gui/levelmeter.h\
gui/loggingdialog.h\
gui/physicalunit.h\
gui/pluginsdialog.h\
gui/presetitem.h\
@ -135,11 +138,13 @@ FORMS += mainwindow.ui\
gui/samplingdevicecontrol.ui\
gui/samplingdevicedialog.ui\
gui/myposdialog.ui\
gui/loggingdialog.ui\
gui/glspectrumgui.ui\
gui/transverterdialog.ui\
mainwindow.ui
LIBS += -L../sdrbase/$${build_subdir} -lsdrbase
LIBS += -L../logging/$${build_subdir} -llogging
RESOURCES = resources/res.qrc

3
windows.install.bat
View File

@ -7,11 +7,12 @@ SET libzlib1dir="D:\softs\zlib-1.2.5"
copy app\%1\sdrangel.exe %2
copy sdrbase\%1\sdrbase.dll %2
copy sdrgui\%1\sdrgui.dll %2
copy devices\%1\devices.dll %2
copy devices\%1\devices.dll %2
copy mbelib\%1\mbelib.dll %2
copy dsdcc\%1\dsdcc.dll %2
copy serialdv\%1\serialdv.dll %2
copy httpserver\%1\httpserver.dll %2
copy logging\%1\logging.dll %2
copy libhackrf\%1\libhackrf.dll %2
copy librtlsdr\%1\librtlsdr.dll %2
copy libairspy\%1\libairspy.dll %2

1
windows64.install.bat
View File

@ -32,6 +32,7 @@ copy dsdcc\%1\dsdcc.dll %2
copy serialdv\%1\serialdv.dll %2
copy nanomsg\%1\nanomsg.dll %2
copy httpserver\%1\httpserver.dll %2
copy logging\%1\logging.dll %2
copy libhackrf\%1\libhackrf.dll %2
copy librtlsdr\%1\librtlsdr.dll %2
copy libairspy\%1\libairspy.dll %2