diff --git a/CellFrameDashboardGUI/main.cpp b/CellFrameDashboardGUI/main.cpp index f79f1d6035543454edd825fbfaed08651d20e3c4..e466e689656618a7d1f469e34ae3855d130629c3 100755 --- a/CellFrameDashboardGUI/main.cpp +++ b/CellFrameDashboardGUI/main.cpp @@ -44,6 +44,7 @@ int main(int argc, char *argv[]) //#ifndef QT_DEBUG #ifdef Q_OS_LINUX dapLogger.setLogFile(QString("/opt/cellframe-dashboard/log/%1Gui.log").arg(DAP_BRAND)); + #elif defined Q_OS_WIN #endif //#endif diff --git a/CellFrameDashboardService/CellFrameDashboardService.pro b/CellFrameDashboardService/CellFrameDashboardService.pro index e94ef6265ba1840f3558f2f59c4d59353200bcb4..a836654430b3b3c9adc7eff1a7624d0c64afb34f 100755 --- a/CellFrameDashboardService/CellFrameDashboardService.pro +++ b/CellFrameDashboardService/CellFrameDashboardService.pro @@ -19,6 +19,7 @@ VER_PAT = 4 ICON = icon.ico win32 { + CONFIG -= console VERSION = $${VER_MAJ}.$${VER_MIN}.$$VER_PAT DEFINES += CLI_PATH=\\\"./cellframe-node-cli.exe\\\" DEFINES += LOG_FILE=\\\"./opt/cellframe-node/var/log/cellframe-node_logs.txt\\\" diff --git a/CellFrameDashboardService/main.cpp b/CellFrameDashboardService/main.cpp index af8c77162e4e2f5ac8ca57d714c7dcec6ffc6544..12226354205c71ba36e0bdf3e66b0f50cffb10f6 100755 --- a/CellFrameDashboardService/main.cpp +++ b/CellFrameDashboardService/main.cpp @@ -39,6 +39,9 @@ int main(int argc, char *argv[]) //#ifndef QT_DEBUG #ifdef Q_OS_LINUX dapLogger.setLogFile(QString("/opt/cellframe-dashboard/log/%1Service.log").arg(DAP_BRAND)); + #elif defined Q_OS_WIN + dapLogger.setLogFile(QString("%1Service.log").arg(DAP_BRAND)); + dapLogger.setLogLevel(L_INFO); #endif //#endif // Creating the main application object diff --git a/libdap b/libdap index ba3e1eed7b6e76393c035986fe27c8e49cafc2d9..ffbc1f0f61cc6b50a85481cd2f9af98dab904a9e 160000 --- a/libdap +++ b/libdap @@ -1 +1 @@ -Subproject commit ba3e1eed7b6e76393c035986fe27c8e49cafc2d9 +Subproject commit ffbc1f0f61cc6b50a85481cd2f9af98dab904a9e diff --git a/libdap-qt b/libdap-qt index 96629d270265f9b75c8c289b7b2ab45ce8f75df3..2cabc1d39de61771f043a5161e7891f22d2d81ae 160000 --- a/libdap-qt +++ b/libdap-qt @@ -1 +1 @@ -Subproject commit 96629d270265f9b75c8c289b7b2ab45ce8f75df3 +Subproject commit 2cabc1d39de61771f043a5161e7891f22d2d81ae