From ee01df484a687fef7ade7c0663da515c29a9dc51 Mon Sep 17 00:00:00 2001
From: Rechi <Rechi@users.noreply.github.com>
Date: Tue, 19 Mar 2019 10:25:37 +0100
Subject: [cmake] zip for android is already handled via PLATFORM_REQUIRED_DEPS

---
 CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ce8872d03..5c7de554bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,9 +140,6 @@ if(NOT WIN32)
 else()
   list(APPEND required_deps D3DX11Effects)
 endif()
-if(CORE_SYSTEM_NAME STREQUAL android)
-  list(APPEND required_deps Zip)
-endif()
 
 # Optional dependencies. Keep in alphabetical order please
 set(optional_deps Alsa
-- 
cgit v1.2.3


From 7f0efb77aabdd94efb29d5d3be4292092b21e54a Mon Sep 17 00:00:00 2001
From: Rechi <Rechi@users.noreply.github.com>
Date: Tue, 19 Mar 2019 10:25:37 +0100
Subject: [cmake] require zlib for all platforms

---
 CMakeLists.txt                                 | 5 ++---
 cmake/platform/windowsstore/windowsstore.cmake | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c7de554bf..85bce62741 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,10 +134,9 @@ set(required_deps ASS
                   Sqlite3
                   TagLib
                   TinyXML
+                  ZLIB
                   ${PLATFORM_REQUIRED_DEPS})
-if(NOT WIN32)
-  list(APPEND required_deps ZLIB)
-else()
+if(WIN32)
   list(APPEND required_deps D3DX11Effects)
 endif()
 
diff --git a/cmake/platform/windowsstore/windowsstore.cmake b/cmake/platform/windowsstore/windowsstore.cmake
index 266fb3ee0e..e69de29bb2 100644
--- a/cmake/platform/windowsstore/windowsstore.cmake
+++ b/cmake/platform/windowsstore/windowsstore.cmake
@@ -1 +0,0 @@
-set(PLATFORM_REQUIRED_DEPS zlib)
-- 
cgit v1.2.3


From 20b5765b281890174ef009c8e13c36303983e0e3 Mon Sep 17 00:00:00 2001
From: Rechi <Rechi@users.noreply.github.com>
Date: Tue, 19 Mar 2019 10:25:38 +0100
Subject: [cmake] handle D3DX11Effects with PLATFORM_REQUIRED_DEPS

---
 CMakeLists.txt                                 | 3 ---
 cmake/platform/windows/windows.cmake           | 2 +-
 cmake/platform/windowsstore/windowsstore.cmake | 1 +
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85bce62741..ec82e148d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,9 +136,6 @@ set(required_deps ASS
                   TinyXML
                   ZLIB
                   ${PLATFORM_REQUIRED_DEPS})
-if(WIN32)
-  list(APPEND required_deps D3DX11Effects)
-endif()
 
 # Optional dependencies. Keep in alphabetical order please
 set(optional_deps Alsa
diff --git a/cmake/platform/windows/windows.cmake b/cmake/platform/windows/windows.cmake
index dbe9417db9..56b87a6730 100644
--- a/cmake/platform/windows/windows.cmake
+++ b/cmake/platform/windows/windows.cmake
@@ -1 +1 @@
-# File intentionally left empty
+set(PLATFORM_REQUIRED_DEPS D3DX11Effects)
diff --git a/cmake/platform/windowsstore/windowsstore.cmake b/cmake/platform/windowsstore/windowsstore.cmake
index e69de29bb2..56b87a6730 100644
--- a/cmake/platform/windowsstore/windowsstore.cmake
+++ b/cmake/platform/windowsstore/windowsstore.cmake
@@ -0,0 +1 @@
+set(PLATFORM_REQUIRED_DEPS D3DX11Effects)
-- 
cgit v1.2.3


From a9ffc374236e7629a1a94d33c781e7d0adcfe4bf Mon Sep 17 00:00:00 2001
From: Rechi <Rechi@users.noreply.github.com>
Date: Tue, 19 Mar 2019 10:25:38 +0100
Subject: [windows] remove pragma lib

They are already handled by CMake.
---
 xbmc/filesystem/XbtFile.cpp     | 10 ----------
 xbmc/filesystem/ZipFile.cpp     |  3 ---
 xbmc/guilib/GUIFontTTF.cpp      |  8 --------
 xbmc/network/WebServer.cpp      |  8 --------
 xbmc/storage/cdioSupport.cpp    |  4 ----
 xbmc/utils/CharsetConverter.cpp |  5 -----
 6 files changed, 38 deletions(-)

diff --git a/xbmc/filesystem/XbtFile.cpp b/xbmc/filesystem/XbtFile.cpp
index d8441ab895..e104e87a0a 100644
--- a/xbmc/filesystem/XbtFile.cpp
+++ b/xbmc/filesystem/XbtFile.cpp
@@ -9,16 +9,6 @@
 #include <algorithm>
 #include <string.h>
 
-#ifdef TARGET_WINDOWS_DESKTOP
-#ifdef NDEBUG
-#pragma comment(lib,"lzo2.lib")
-#elif defined _WIN64
-#pragma comment(lib, "lzo2d.lib")
-#else
-#pragma comment(lib, "lzo2-no_idb.lib")
-#endif
-#endif
-
 #include <lzo/lzo1x.h>
 
 #include "XbtFile.h"
diff --git a/xbmc/filesystem/ZipFile.cpp b/xbmc/filesystem/ZipFile.cpp
index f769ab4f44..071f926914 100644
--- a/xbmc/filesystem/ZipFile.cpp
+++ b/xbmc/filesystem/ZipFile.cpp
@@ -14,9 +14,6 @@
 
 #include <sys/stat.h>
 
-#if defined (TARGET_WINDOWS)
-#pragma comment(lib, "zlib.lib")
-#endif
 #define ZIP_CACHE_LIMIT 4*1024*1024
 
 using namespace XFILE;
diff --git a/xbmc/guilib/GUIFontTTF.cpp b/xbmc/guilib/GUIFontTTF.cpp
index 906db44dad..af376751da 100644
--- a/xbmc/guilib/GUIFontTTF.cpp
+++ b/xbmc/guilib/GUIFontTTF.cpp
@@ -37,14 +37,6 @@
 #include FT_OUTLINE_H
 #include FT_STROKER_H
 
-#ifdef TARGET_WINDOWS
-#ifdef NDEBUG
-#pragma comment(lib, "freetype.lib")
-#else
-#pragma comment(lib, "freetyped.lib")
-#endif
-#endif
-
 #define CHARS_PER_TEXTURE_LINE 20 // number of characters to cache per texture line
 #define CHAR_CHUNK    64      // 64 chars allocated at a time (1024 bytes)
 #define GLYPH_STRENGTH_BOLD 24
diff --git a/xbmc/network/WebServer.cpp b/xbmc/network/WebServer.cpp
index 685fe6d972..7834042277 100644
--- a/xbmc/network/WebServer.cpp
+++ b/xbmc/network/WebServer.cpp
@@ -34,14 +34,6 @@
 #include "utils/Variant.h"
 #include "XBDateTime.h"
 
-#ifdef TARGET_WINDOWS_DESKTOP
-#ifndef _DEBUG
-#pragma comment(lib, "libmicrohttpd.lib")
-#else  // _DEBUG
-#pragma comment(lib, "libmicrohttpd_d.lib")
-#endif // _DEBUG
-#endif // TARGET_WINDOWS_DESKTOP
-
 #define MAX_POST_BUFFER_SIZE 2048
 
 #define PAGE_FILE_NOT_FOUND "<html><head><title>File not found</title></head><body>File not found</body></html>"
diff --git a/xbmc/storage/cdioSupport.cpp b/xbmc/storage/cdioSupport.cpp
index d2cf26d108..1b2f16f7ab 100644
--- a/xbmc/storage/cdioSupport.cpp
+++ b/xbmc/storage/cdioSupport.cpp
@@ -16,10 +16,6 @@
 #include <cdio/mmc.h>
 #include <cdio/cd_types.h>
 
-#if defined(TARGET_WINDOWS)
-#pragma comment(lib, "libcdio.lib")
-#endif
-
 using namespace MEDIA_DETECT;
 
 std::shared_ptr<CLibcdio> CLibcdio::m_pInstance;
diff --git a/xbmc/utils/CharsetConverter.cpp b/xbmc/utils/CharsetConverter.cpp
index 1718c6d08d..c1452680ea 100644
--- a/xbmc/utils/CharsetConverter.cpp
+++ b/xbmc/utils/CharsetConverter.cpp
@@ -43,11 +43,6 @@
   #define UTF32_CHARSET "UTF-32" ENDIAN_SUFFIX
   #define UTF8_SOURCE "UTF-8"
   #define WCHAR_CHARSET UTF16_CHARSET
-#if _DEBUG && !defined(TARGET_WINDOWS_STORE)
-  #pragma comment(lib, "libiconvd.lib")
-#else
-  #pragma comment(lib, "libiconv.lib")
-#endif
 #elif defined(TARGET_FREEBSD)
   #define WCHAR_IS_UCS_4 1
   #define UTF16_CHARSET "UTF-16" ENDIAN_SUFFIX
-- 
cgit v1.2.3