From 147095fc076f615563bef6c08b48fb988f068c8a Mon Sep 17 00:00:00 2001
From: oy <Tom_Adams@web.de>
Date: Sun, 27 Mar 2011 13:09:10 +0200
Subject: added update to version 2.4.4 and dynamic library for freetype by
 Sworddragon. Closes #77. Closes #513

---
 .gitignore                                 |   1 +
 bam.lua                                    |   2 +-
 other/freetype/freetype.lua                |   7 ++-----
 other/freetype/include/freetype/freetype.h |   2 +-
 other/freetype/include/freetype/ftcache.h  |  12 ++++++++++++
 other/freetype/lib/freetype.dll            | Bin 0 -> 422400 bytes
 other/freetype/lib/freetype.lib            | Bin 0 -> 3178 bytes
 other/freetype/lib/freetype243MT.lib       | Bin 778610 -> 0 bytes
 other/freetype/lib/freetype243MT_D.lib     | Bin 2429322 -> 0 bytes
 other/freetype/lib/vc100.pdb               | Bin 331776 -> 0 bytes
 10 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 other/freetype/lib/freetype.dll
 create mode 100644 other/freetype/lib/freetype.lib
 delete mode 100644 other/freetype/lib/freetype243MT.lib
 delete mode 100644 other/freetype/lib/freetype243MT_D.lib
 delete mode 100644 other/freetype/lib/vc100.pdb

diff --git a/.gitignore b/.gitignore
index 42f72257..6ddafaf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ bam
 config.lua
 datasrc/__pycache__
 datasrc/*.pyc
+freetype*.dll
 objs
 src/game/generated
 SDL.dll
diff --git a/bam.lua b/bam.lua
index efff7cb6..9b2661f5 100644
--- a/bam.lua
+++ b/bam.lua
@@ -112,6 +112,7 @@ client_link_other = {}
 client_depends = {}
 
 if family == "windows" then
+	table.insert(client_depends, CopyToDirectory(".", "other\\freetype\\lib\\freetype.dll"))
 	table.insert(client_depends, CopyToDirectory(".", "other\\sdl\\vc2005libs\\SDL.dll"))
 
 	if config.compiler.driver == "cl" then
@@ -326,4 +327,3 @@ else
 	build(release_settings)
 	DefaultTarget("game_debug")
 end
-
diff --git a/other/freetype/freetype.lua b/other/freetype/freetype.lua
index 7c7e8570..5b871dcc 100644
--- a/other/freetype/freetype.lua
+++ b/other/freetype/freetype.lua
@@ -28,11 +28,8 @@ FreeType = {
 				settings.link.flags:Add("`freetype-config --libs`")
 				
 			elseif option.use_win32lib == true then
-				if settings.debug > 0 then
-					settings.link.libs:Add(FreeType.basepath .. "/lib/freetype243MT_D")
-				else
-					settings.link.libs:Add(FreeType.basepath .. "/lib/freetype243MT")
-				end
+				settings.link.libpath:Add(FreeType.basepath .. "/lib")
+				settings.link.libs:Add("freetype")
 			end
 		end
 		
diff --git a/other/freetype/include/freetype/freetype.h b/other/freetype/include/freetype/freetype.h
index 3b303325..70c39008 100644
--- a/other/freetype/include/freetype/freetype.h
+++ b/other/freetype/include/freetype/freetype.h
@@ -3808,7 +3808,7 @@ FT_BEGIN_HEADER
    */
 #define FREETYPE_MAJOR  2
 #define FREETYPE_MINOR  4
-#define FREETYPE_PATCH  3
+#define FREETYPE_PATCH  4
 
 
   /*************************************************************************/
diff --git a/other/freetype/include/freetype/ftcache.h b/other/freetype/include/freetype/ftcache.h
index fe8664d0..6af53062 100644
--- a/other/freetype/include/freetype/ftcache.h
+++ b/other/freetype/include/freetype/ftcache.h
@@ -214,12 +214,17 @@ FT_BEGIN_HEADER
 
  /* */
 
+#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
+
+  /* these macros are incompatible with LLP64, should not be used */
+
 #define FT_POINTER_TO_ULONG( p )  ( (FT_ULong)(FT_Pointer)(p) )
 
 #define FTC_FACE_ID_HASH( i )                                \
           ((FT_UInt32)(( FT_POINTER_TO_ULONG( i ) >> 3 ) ^   \
                        ( FT_POINTER_TO_ULONG( i ) << 7 ) ) )
 
+#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
 
   /*************************************************************************/
   /*************************************************************************/
@@ -700,11 +705,17 @@ FT_BEGIN_HEADER
             (d1)->width   == (d2)->width   && \
             (d1)->flags   == (d2)->flags   )
 
+#ifdef FT_CONFIG_OPTION_OLD_INTERNALS
+
+  /* this macro is incompatible with LLP64, should not be used */
+
 #define FTC_IMAGE_TYPE_HASH( d )                          \
           (FT_UFast)( FTC_FACE_ID_HASH( (d)->face_id )  ^ \
                       ( (d)->width << 8 ) ^ (d)->height ^ \
                       ( (d)->flags << 4 )               )
 
+#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */
+
 
   /*************************************************************************/
   /*                                                                       */
@@ -1096,6 +1107,7 @@ FT_BEGIN_HEADER
             (f1)->pix_width  == (f2)->pix_width  && \
             (f1)->pix_height == (f2)->pix_height )
 
+  /* this macro is incompatible with LLP64, should not be used */
 #define FTC_FONT_HASH( f )                              \
           (FT_UInt32)( FTC_FACE_ID_HASH((f)->face_id) ^ \
                        ((f)->pix_width << 8)          ^ \
diff --git a/other/freetype/lib/freetype.dll b/other/freetype/lib/freetype.dll
new file mode 100644
index 00000000..93a691ad
Binary files /dev/null and b/other/freetype/lib/freetype.dll differ
diff --git a/other/freetype/lib/freetype.lib b/other/freetype/lib/freetype.lib
new file mode 100644
index 00000000..0f1b7b9a
Binary files /dev/null and b/other/freetype/lib/freetype.lib differ
diff --git a/other/freetype/lib/freetype243MT.lib b/other/freetype/lib/freetype243MT.lib
deleted file mode 100644
index 1740877b..00000000
Binary files a/other/freetype/lib/freetype243MT.lib and /dev/null differ
diff --git a/other/freetype/lib/freetype243MT_D.lib b/other/freetype/lib/freetype243MT_D.lib
deleted file mode 100644
index be943dc2..00000000
Binary files a/other/freetype/lib/freetype243MT_D.lib and /dev/null differ
diff --git a/other/freetype/lib/vc100.pdb b/other/freetype/lib/vc100.pdb
deleted file mode 100644
index 299f3573..00000000
Binary files a/other/freetype/lib/vc100.pdb and /dev/null differ
-- 
cgit 1.4.1