diff options
| author | WiSo <wiso@xbmc.org> | 2011-04-10 00:57:37 +0200 |
|---|---|---|
| committer | WiSo <wiso@xbmc.org> | 2011-04-10 00:57:37 +0200 |
| commit | fe53faf899d30a54acb6d9010fb4021a8c531e14 (patch) | |
| tree | c815ff569cbce6839782358376833a820c0ccbb7 | |
| parent | fd8d4fbb20776fbcd31796740737906b70656de4 (diff) | |
[WIN32] changed source files to use external liblzo. /lib/win32/liblzo still needs to be there for the TexturePacker though it doesn't compile anymore ...
| -rw-r--r-- | xbmc/guilib/TextureBundleXBT.cpp | 8 | ||||
| -rw-r--r-- | xbmc/guilib/TextureBundleXPR.cpp | 8 |
2 files changed, 5 insertions, 11 deletions
diff --git a/xbmc/guilib/TextureBundleXBT.cpp b/xbmc/guilib/TextureBundleXBT.cpp index 7d56e0c65c..11b32131de 100644 --- a/xbmc/guilib/TextureBundleXBT.cpp +++ b/xbmc/guilib/TextureBundleXBT.cpp @@ -31,14 +31,10 @@ #include "utils/EndianSwap.h" #include "utils/URIUtils.h" #include "XBTF.h" -#ifndef _LINUX -#include "lib/win32/liblzo/LZO1X.H" -#else #include <lzo/lzo1x.h> -#endif -#if !defined(__GNUC__) -#pragma comment(lib,"../../lib/win32/liblzo/lzo.lib") +#ifdef _WIN32 +#pragma comment(lib,"liblzo2.lib") #endif CTextureBundleXBT::CTextureBundleXBT(void) diff --git a/xbmc/guilib/TextureBundleXPR.cpp b/xbmc/guilib/TextureBundleXPR.cpp index 1401177132..50ebe946ae 100644 --- a/xbmc/guilib/TextureBundleXPR.cpp +++ b/xbmc/guilib/TextureBundleXPR.cpp @@ -28,18 +28,16 @@ #ifndef _LINUX #include <sys/stat.h> #include "utils/CharsetConverter.h" -#include "lib/win32/liblzo/LZO1X.H" -#else -#include <lzo/lzo1x.h> #endif +#include <lzo/lzo1x.h> #include "addons/Skin.h" #include "settings/GUISettings.h" #include "filesystem/SpecialProtocol.h" #include "utils/EndianSwap.h" #include "utils/URIUtils.h" -#if !defined(__GNUC__) -#pragma comment(lib,"../../lib/win32/liblzo/lzo.lib") +#ifdef _WIN32 +#pragma comment(lib,"liblzo2.lib") #endif // alignment of file blocks - should be a multiple of the sector size of the disk and a power of 2 |