From 07eea7be525fc5737784dbf2f60030a4ff575af8 Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Thu, 11 Jun 2015 20:35:21 -0700
Subject: [PATCH] updated freetype, working ft builds on vc2010

---
 winbuild/build_dep.py | 23 +++++++++++++++++++----
 winbuild/config.py    | 15 ++++++++++-----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/winbuild/build_dep.py b/winbuild/build_dep.py
index 166dd8f85..55a09c995 100644
--- a/winbuild/build_dep.py
+++ b/winbuild/build_dep.py
@@ -206,8 +206,23 @@ endlocal
 
 """ % compiler
     
-      
 def msbuild_freetype(compiler):
+	if compiler['env_version'] == 'v7.1':
+		return msbuild_freetype_71(compiler)
+	return msbuild_freetype_70(compiler)
+      
+def msbuild_freetype_71(compiler):
+    return r"""
+rem Build freetype
+setlocal
+rd /S /Q %%FREETYPE%%\objs
+%%MSBUILD%% %%FREETYPE%%\builds\windows\vc%(vc_version)s\freetype.sln /t:Clean;Build /p:Configuration="Release" /p:Platform=%(platform)s /m 
+xcopy /Y /E /Q %%FREETYPE%%\include %%INCLIB%%
+copy /Y /B %%FREETYPE%%\objs\vc%(vc_version)s\%(platform)s\*.lib %%INCLIB%%\freetype.lib
+endlocal
+""" %compiler
+
+def msbuild_freetype_70(compiler):
     return r"""
 rem Build freetype
 setlocal
@@ -255,13 +270,13 @@ fetch_libs()
 script = [header()] #, cp_tk()]
 
     
-#for compiler in compilers.values():
-#    add_compiler(compiler)
 
 if 'PYTHON' in os.environ:
     add_compiler(compiler_fromEnv())
 else:
-    add_compiler(compilers[(7,64)])
+    for compiler in compilers.values():
+        add_compiler(compiler)
+    #add_compiler(compilers[(7,32)])
     
 with open('build_deps.cmd', 'w') as f:    
     f.write("\n".join(script))
diff --git a/winbuild/config.py b/winbuild/config.py
index 7ac50f209..9c281ee51 100644
--- a/winbuild/config.py
+++ b/winbuild/config.py
@@ -26,12 +26,17 @@ libs = { 'zlib':{
     'hash': 'md5:dd70349cedb3981371686e1c9b89a7f9', # not found - generated by wiredfool
     'dir': 'tiff-4.0.3',
    },
-         'freetype':{
-    'url':'http://download.savannah.gnu.org/releases/freetype/ft253.zip',
-    'hash': 'md5:b3858f7e69740ac04ef53366aeb172bc', # not found - generated by wiredfool
-    'dir': 'freetype-2.5.3',
+#         'freetype':{
+#   'url':'http://download.savannah.gnu.org/releases/freetype/ft253.zip',
+#   'hash': 'md5:b3858f7e69740ac04ef53366aeb172bc', # not found - generated by wiredfool
+#   'dir': 'freetype-2.5.3',
+#   },
+'freetype':{
+	'url': 'http://download.savannah.gnu.org/releases/freetype/freetype-2.6.tar.gz',
+	'hash':'md5:1d733ea6c1b7b3df38169fbdbec47d2b',
+	'dir': 'freetype-2.6',
     },
-         'lcms':{
+'lcms':{
     'url':SF_MIRROR+'/project/lcms/lcms/2.6/lcms2-2.6.zip',
     'hash': 'sha1:eea25f001246fa2e6b242ac456cecff7483cf061',
     'dir': 'lcms2-2.6',