Added windows port fixes

.gitignore

@@ -4,3 +4,17 @@ build
 src/CMakeCache.txt
 src/CMakeFiles/
 src/cmake_install.cmake
+
+# Buildfiles on windows
+ALL_BUILD.vcxproj
+ALL_BUILD.vcxproj.filters
+CMakeCache.txt
+CMakeFiles/
+INSTALL.vcxproj
+INSTALL.vcxproj.filters
+ZERO_CHECK.vcxproj
+ZERO_CHECK.vcxproj.filters
+cmake_install.cmake
+vscp-works-qt.sln
+vscp-works-qt.vcxproj
+vscp-works-qt.vcxproj.filters

.vscode/settings.json

@@ -87,13 +87,8 @@
         "**/.git/subtree-cache/**": true,
         "**/node_modules/**": true
     },
-    "cSpell.words": [
-        "c",
-        "display",
-        "dlg",
-        "guid",
-        "index",
-        "sensor",
-        "str"
+    "cmake.configureArgs": [
+        "-DVCPKG_TARGET_TRIPLET=x64-windows",
+        "-DCMAKE_TOOLCHAIN_FILE=E:/development/vcpkg/scripts/buildsystems/vcpkg.cmake"
     ]
 }

CMakeLists.txt

@@ -49,6 +49,7 @@ endif()
 
 if(WIN32)
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    add_definitions(-DWIN32_LEAN_AND_MEANS)
     set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
     set(LIBS_SYSTEM ws2_32)
 elseif(UNIX)
@@ -59,6 +60,11 @@ if (WIN32)
 #set (CMAKE_PREFIX_PATH "E:\\Qt\\5.15.2\\msvc2019_64\\")
 endif()
 
+# if (MSVC)
+# # use precompiled headers
+# set (CMAKE_AUTOMOC_MOC_OPTIONS "-bstdafx.h" "-fstdafx.h")
+# endif()
+
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 set(CMAKE_AUTOUIC ON)
@@ -122,6 +128,7 @@ if (WIN32)
 #   set(DLFCN__LIBS "E:\\development\\dlfcn-win32\\src\\")
 endif() 
 
+
 # Set civetweb build flags
 set(CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -DUSE_IPV6 -DUSE_WEBSOCKET")
 string(FIND "${OPENSSL_VERSION}" "1.1." SSL_VER_POS)
@@ -436,12 +443,17 @@ add_executable(vscp-works-qt
     ${VSCP_PATH}/src/common/fastpbkdf2.h
     ${VSCP_PATH}/src/common/fastpbkdf2.c    
     install/vscp-works-qt.desktop
-    ${TS_FILES}
+    ${TS_FILES}    
   ) 
 
+# add_executable(vscp-works-qt
+#     src/StdAfx.h
+#     src/StdAfx.cpp
+# )
+
 if (WIN32)
-set(LOCAL_WIN_INCLUDE "windows\\include\\")
-set(LOCAL_SYSLOG_INCLUDE "windows\\syslog\\include\\")
+#set(LOCAL_WIN_INCLUDE "windows\\include\\")
+#set(LOCAL_SYSLOG_INCLUDE "windows\\syslog\\include\\")
 endif()  
 
 if (WIN32)
@@ -543,9 +555,9 @@ message(" PAHO_LIBRARIES = ${PAHO_LIBRARIES}")
 
 message(Main include: "${VCPKG_HOME}/installed/x64_linux/include")
 
-#include(GNUInstallDirs)
 if(WIN32)
-	  add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    add_definitions(-DWIN32_LEAN_AND_MEANS)
     set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
     set(LIBS_SYSTEM ws2_32)
 elseif(UNIX)
@@ -562,4 +574,4 @@ install(FILES ${CMAKE_SOURCE_DIR}/install/vscp-works-qt.desktop
 install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/icons/ DESTINATION ${INSTALL_PATH}/share/icons/) 
 
 # Event database etc
-install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/install/share/ DESTINATION ${INSTALL_PATH}/share/vscp-works-qt/) 
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/install/share/ DESTINATION ${INSTALL_PATH}/share/vscp-works-qt/)

src/canalconfigwizard.cpp

@@ -26,6 +26,10 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include <QtWidgets>
 #include <QDebug>
 

src/cdlgcanfilter.cpp

@@ -26,6 +26,10 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include "cdlgcanfilter.h"
 #include "ui_cdlgcanfilter.h"
 

src/cdlgconnsettingscanal.cpp

@@ -26,6 +26,9 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
 
 #include "cdlgconnsettingscanal.h"
 #include "ui_cdlgconnsettingscanal.h"

src/cdlgconnsettingslocal.cpp

@@ -26,6 +26,9 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
 
 #include "cdlgconnsettingslocal.h"
 #include "ui_cdlgconnsettingslocal.h"

src/cdlgconnsettingsmqtt.cpp

@@ -26,6 +26,10 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include "vscpworks.h"
 #include <vscphelper.h>
 

src/cdlgconnsettingsmulticast.cpp

@@ -26,6 +26,10 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include <vscp.h>
 #include <vscphelper.h>
 

src/cdlgconnsettingsrawcan.cpp

@@ -26,6 +26,12 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
+#ifndef WIN32
+
 #include <vscphelper.h>
 #include <vscp_client_socketcan.h>
 
@@ -507,3 +513,4 @@ void CDlgConnSettingsRawCan::onTestConnection(void)
     }
 }
 
+#endif   // WIN32

src/cdlgconnsettingsrawcan.h

@@ -29,6 +29,8 @@
 #ifndef CDLGCONNSETTINGSRAWCAN_H
 #define CDLGCONNSETTINGSRAWCAN_H
 
+#ifndef WIN32
+
 #include "vscp_client_socketcan.h"
 
 #include <QDialog>
@@ -147,5 +149,6 @@ class CDlgConnSettingsRawCan : public QDialog
     vscpClientSocketCan m_clientSocketcan;
 };
 
+#endif  // WIN23
 
 #endif // CDLGCONNSETTINGSRAWCAN_H

src/cdlgconnsettingsrawmqtt.cpp

@@ -26,6 +26,10 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include "vscpworks.h"
 #include <vscphelper.h>
 

src/cdlgconnsettingsrest.cpp

@@ -26,6 +26,10 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include <vscp.h>
 #include <vscphelper.h>
 

src/cdlgconnsettingssocketcan.cpp

@@ -26,6 +26,12 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
+#ifndef WIN32
+
 #include <vscphelper.h>
 #include <vscp_client_socketcan.h>
 
@@ -528,3 +534,4 @@ void CDlgConnSettingsSocketCan::onTestConnection(void)
     }
 }
 
+#endif  // WIN32

src/cdlgconnsettingssocketcan.h

@@ -29,6 +29,8 @@
 #ifndef CDLGCONNSETTINGSSOCKETCAN_H
 #define CDLGCONNSETTINGSSOCKETCAN_H
 
+#ifndef WIN32
+
 #include "vscp_client_socketcan.h"
 
 #include <QDialog>
@@ -166,5 +168,6 @@ class CDlgConnSettingsSocketCan : public QDialog
     vscpClientSocketCan m_clientSocketcan;
 };
 
+#endif  // WIN32
 
 #endif // CDLGCONNSETTINGSSOCKETCAN_H

src/cdlgconnsettingstcpip.cpp

@@ -26,6 +26,14 @@
 // SOFTWARE.
 //
 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include "vscpworks.h"
 
 #include "cdlgconnsettingstcpip.h"

src/cdlgconnsettingstcpip.h

@@ -29,6 +29,9 @@
 #ifndef CDLGCONNSETTINGSTCPIP_H
 #define CDLGCONNSETTINGSTCPIP_H
 
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
 
 #include "vscp_client_tcp.h"
 

src/cdlgconnsettingsudp.cpp

@@ -26,6 +26,10 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include <vscp.h>
 #include <vscphelper.h>
 

src/cdlgconnsettingsws1.cpp

@@ -26,6 +26,10 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include <vscp.h>
 #include <vscphelper.h>
 

src/cdlgconnsettingsws2.cpp

@@ -26,6 +26,10 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include <vscp.h>
 #include <vscphelper.h>
 

src/cdlgeditguid.cpp

@@ -26,6 +26,10 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include <vscp.h>
 #include <vscphelper.h>
 

src/cdlgeditsensorindex.cpp

@@ -26,6 +26,10 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include <vscp.h>
 #include <vscphelper.h>
 

src/cdlgeditsessionfilter.cpp

@@ -26,6 +26,10 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include <vscp.h>
 #include <vscphelper.h>
 

src/cdlgknownguid.cpp

@@ -26,6 +26,10 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include <vscp.h>
 #include <guid.h>
 #include <vscphelper.h>

src/cdlglevel1filter.cpp

@@ -26,6 +26,10 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include <vscp.h>
 #include <vscphelper.h>
 

src/cdlglevel1filterwizard.cpp

@@ -28,6 +28,10 @@
 // https://blog.csdn.net/weixin_30251587/article/details/96939409
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include "vscphelper.h"
 #include "vscpworks.h"
 

src/cdlglevel2filter.cpp

@@ -26,6 +26,10 @@
 // SOFTWARE.
 //
 
+#ifdef WIN32
+#include "StdAfx.h"
+#endif
+
 #include "vscphelper.h"
 #include "vscpworks.h"