aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRechi <Rechi@users.noreply.github.com>2019-03-19 11:22:34 +0100
committerGitHub <noreply@github.com>2019-03-19 11:22:34 +0100
commite0e175332363397141810a8784e0b81613c8b76d (patch)
tree46e3588f7cdbcde3c93048ec30ca1de5a4ca0093
parentbc5ee9fe3b9773d49dae2e41022ba3ae70321482 (diff)
parenta9ffc374236e7629a1a94d33c781e7d0adcfe4bf (diff)
Merge pull request #15712 from Rechi/windows/pragma
[windows] remove pragma lib
-rw-r--r--CMakeLists.txt9
-rw-r--r--cmake/platform/windows/windows.cmake2
-rw-r--r--cmake/platform/windowsstore/windowsstore.cmake2
-rw-r--r--xbmc/filesystem/XbtFile.cpp10
-rw-r--r--xbmc/filesystem/ZipFile.cpp3
-rw-r--r--xbmc/guilib/GUIFontTTF.cpp8
-rw-r--r--xbmc/network/WebServer.cpp8
-rw-r--r--xbmc/storage/cdioSupport.cpp4
-rw-r--r--xbmc/utils/CharsetConverter.cpp5
9 files changed, 3 insertions, 48 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ce8872d03..ec82e148d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,15 +134,8 @@ set(required_deps ASS
Sqlite3
TagLib
TinyXML
+ ZLIB
${PLATFORM_REQUIRED_DEPS})
-if(NOT WIN32)
- list(APPEND required_deps ZLIB)
-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
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 266fb3ee0e..56b87a6730 100644
--- a/cmake/platform/windowsstore/windowsstore.cmake
+++ b/cmake/platform/windowsstore/windowsstore.cmake
@@ -1 +1 @@
-set(PLATFORM_REQUIRED_DEPS zlib)
+set(PLATFORM_REQUIRED_DEPS D3DX11Effects)
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