aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Brochet <blinkseb@xbmc.org>2011-09-25 11:26:46 +0200
committerSébastien Brochet <blinkseb@xbmc.org>2011-09-25 11:26:46 +0200
commit85586f307dea1da3ca8c79a3dfadd61e9eafe40c (patch)
treed26dd8f484ccbe31611edd2e6e9ffe24ee6ea345
parent0074b5ea35aee51d276088fb9a1e4e365ed23b9e (diff)
[WIN32] updated freetype to v2.4.6
-rw-r--r--lib/libass/libass/ass.c2
-rw-r--r--project/BuildDependencies/scripts/freetype_d.bat4
-rw-r--r--project/BuildDependencies/scripts/freetype_d.txt2
-rw-r--r--xbmc/guilib/GUIFontTTF.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/libass/libass/ass.c b/lib/libass/libass/ass.c
index e956a71dd4..8d2e26844a 100644
--- a/lib/libass/libass/ass.c
+++ b/lib/libass/libass/ass.c
@@ -43,7 +43,7 @@
#ifdef _WIN32
#pragma comment(lib, "libiconv.lib")
-#pragma comment(lib, "freetype244MT.lib")
+#pragma comment(lib, "freetype246MT.lib")
#endif
#define ass_atof(STR) (ass_strtod((STR),NULL))
diff --git a/project/BuildDependencies/scripts/freetype_d.bat b/project/BuildDependencies/scripts/freetype_d.bat
index c3ed95ed09..1dcf14d000 100644
--- a/project/BuildDependencies/scripts/freetype_d.bat
+++ b/project/BuildDependencies/scripts/freetype_d.bat
@@ -7,7 +7,7 @@ CALL dlextract.bat freetype %FILES%
cd %TMP_PATH%
-xcopy freetype-2.4.4-win32\include\* "%CUR_PATH%\include\" /E /Q /I /Y
-copy freetype-2.4.4-win32\lib\freetype244MT.lib "%CUR_PATH%\lib\" /Y
+xcopy freetype-2.4.6-win32\include\* "%CUR_PATH%\include\" /E /Q /I /Y
+copy freetype-2.4.6-win32\lib\freetype246MT.lib "%CUR_PATH%\lib\" /Y
cd %LOC_PATH%
diff --git a/project/BuildDependencies/scripts/freetype_d.txt b/project/BuildDependencies/scripts/freetype_d.txt
index 43c0119941..bddfdb9d59 100644
--- a/project/BuildDependencies/scripts/freetype_d.txt
+++ b/project/BuildDependencies/scripts/freetype_d.txt
@@ -1,2 +1,2 @@
; filename mirror of the file
-freetype-2.4.4-win32.zip http://mirrors.xbmc.org/build-deps/win32/
+freetype-2.4.6-win32.zip http://mirrors.xbmc.org/build-deps/win32/
diff --git a/xbmc/guilib/GUIFontTTF.cpp b/xbmc/guilib/GUIFontTTF.cpp
index 303ca0eec3..35c36ed03d 100644
--- a/xbmc/guilib/GUIFontTTF.cpp
+++ b/xbmc/guilib/GUIFontTTF.cpp
@@ -41,7 +41,7 @@
#define USE_RELEASE_LIBS
#ifdef _WIN32
-#pragma comment(lib, "freetype244MT.lib")
+#pragma comment(lib, "freetype246MT.lib")
#endif
using namespace std;