Fix Windows build

Author: AlwinEsch

src/CMakeLists.txt

@@ -59,3 +59,5 @@ if(WIN32)
 endif()
 
 add_library(code_src OBJECT ${SOURCES} ${HEADERS})
+target_link_libraries(code_src ${DEPLIBS})
+

src/addon.cpp

@@ -21,8 +21,19 @@
 //---------------------------------------------------------------------------
 
 #include "addon.h"
-
+#include "channeladd.h"
+#include "channelsettings.h"
+#include "dabstream.h"
+#include "dbtypes.h"
+#include "filedevice.h"
+#include "fmstream.h"
+#include "hdstream.h"
 #include "stdafx.h"
+#include "sqlite_exception.h"
+#include "string_exception.h"
+#include "tcpdevice.h"
+#include "usbdevice.h"
+#include "wxstream.h"
 
 #include <assert.h>
 #include <kodi/Filesystem.h>
@@ -35,25 +46,17 @@
 #include <rapidjson/prettywriter.h>
 #include <utility>
 #include <vector>
-// #include <version.h>
 
-#ifdef __ANDROID__
-#include <android/log.h>
-#endif
+#ifdef WIN32
+#include <Windows.h>
 
-#include "channeladd.h"
-#include "channelsettings.h"
-#include "dabstream.h"
-#include "dbtypes.h"
-#include "filedevice.h"
-#include "fmstream.h"
-#include "hdstream.h"
-#include "sqlite_exception.h"
-#include "string_exception.h"
-#include "tcpdevice.h"
-#include "usbdevice.h"
-#include "wxstream.h"
+#ifdef CreateDirectory
+#undef CreateDirectory
+#endif // CreateDirectory
 
+#elif defined(__ANDROID__)
+#include <android/log.h>
+#endif
 #pragma warning(push, 4)
 
 // Addon Entry Points

src/dabmuxscanner.cpp

@@ -25,6 +25,7 @@
 #include "stdafx.h"
 
 #include <algorithm>
+#include <assert.h>
 #include <stdexcept>
 
 #pragma warning(push, 4)

src/filedevice.cpp

@@ -22,9 +22,9 @@
 
 #include "filedevice.h"
 
-#include "stdafx.h"
 #include "string_exception.h"
 
+#include <assert.h>
 #include <chrono>
 #include <limits.h>
 #include <stdio.h>

src/hdmuxscanner.cpp

@@ -25,6 +25,7 @@
 #include "stdafx.h"
 
 #include <algorithm>
+#include <assert.h>
 #include <stdexcept>
 
 #pragma warning(push, 4)

src/renderingcontrol.h

@@ -87,9 +87,9 @@ class ATTR_DLL_LOCAL renderingcontrol : public kodi::gui::CAddonGUIControlBase
   // Stop (virtual)
   //
   // Stop the rendering process
-  //virtual void Stop(void)
-  //{
-  //}
+  virtual void Stop(void)
+  {
+  }
 
 protected:
   //-------------------------------------------------------------------------

src/signalmeter.cpp

@@ -26,6 +26,7 @@
 #include "stdafx.h"
 #include "string_exception.h"
 
+#include <assert.h>
 #include <cmath>
 #include <string.h>
 

src/stdafx.h

@@ -24,66 +24,6 @@
 #define __STDAFX_H_
 #pragma once
 
-//---------------------------------------------------------------------------
-// Windows
-//---------------------------------------------------------------------------
-
-#if defined(_WINDOWS)
-
-#define WINVER _WIN32_WINNT_WIN8
-#define _WIN32_WINNT _WIN32_WINNT_WIN8
-#define _WIN32_IE _WIN32_IE_IE80
-#define NOMINMAX
-
-#include <WS2tcpip.h>
-#include <WinSock2.h>
-#include <Windows.h>
-#include <wchar.h> // Prevents redefinition of WCHAR_MIN by libusb
-
-#define TARGET_WINDOWS
-#define HAS_ANGLE
-#define HAS_GLES 3 // ANGLE supports GLESv3
-
-#define LIBANGLE_IMPLEMENTATION
-#define ANGLE_EXPORT
-#define ANGLE_UTIL_EXPORT
-#define EGLAPI
-#define GL_APICALL
-#define GL_API
-
-#define GL_GLES_PROTOTYPES 1
-#define EGL_EGL_PROTOTYPES 1
-#define GL_GLEXT_PROTOTYPES 1
-#define EGL_EGLEXT_PROTOTYPES 1
-
-// Android
-#elif defined(__ANDROID__)
-
-#define TARGET_POSIX
-#define TARGET_LINUX
-#define TARGET_ANDROID
-#define HAS_GLES 3 // Android supports GLESv3
-
-// MacOS
-#elif defined(__APPLE__)
-
-#define TARGET_POSIX
-#define TARGET_DARWIN
-#define TARGET_DARWIN_OSX
-#define HAS_GL 1
-
-// Linux
-#else
-
-#define TARGET_POSIX
-#define TARGET_LINUX
-#define HAS_GLES 2 // Assume GLESv2 support on Linux
-
-#endif
-
-#include <assert.h>
-#include <stdint.h>
-
 // KiB / MiB / GiB
 //
 #define KiB *(1 << 10)

src/tcpdevice.cpp

@@ -22,11 +22,13 @@
 
 #include "tcpdevice.h"
 
-#include "stdafx.h"
-
 #include <algorithm>
+#include <assert.h>
 #ifdef WIN32
-#include <Winsock2.h>
+#include <WS2tcpip.h>
+#include <WinSock2.h>
+#include <Windows.h>
+#include <wchar.h> // Prevents redefinition of WCHAR_MIN by libusb
 #else
 #include <arpa/inet.h>
 #include <netdb.h>

src/win32_exception.cpp

@@ -22,8 +22,6 @@
 
 #include "win32_exception.h"
 
-#include "stdafx.h"
-
 #pragma warning(push, 4)
 
 //-----------------------------------------------------------------------------

src/win32_exception.h

@@ -26,6 +26,7 @@
 
 #include <exception>
 #include <string>
+#include <windows.h>
 
 #pragma warning(push, 4)