[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16315] trunk/lib/win64/freetype: Correcting freetype lib so it doesn't crash anymore.

[Daniel Genrich]

Revision: 16315
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16315
Author:   genscher
Date:     2008-08-31 04:01:22 +0200 (Sun, 31 Aug 2008)

Log Message:
-----------
Correcting freetype lib so it doesn't crash anymore.

Modified Paths:
--------------
    trunk/lib/win64/freetype/include/freetype/config/ftoption.h
    trunk/lib/win64/freetype/lib/freetype2ST.lib

Modified: trunk/lib/win64/freetype/include/freetype/config/ftoption.h
===================================================================
--- trunk/lib/win64/freetype/include/freetype/config/ftoption.h	2008-08-31 01:57:53 UTC (rev 16314)
+++ trunk/lib/win64/freetype/include/freetype/config/ftoption.h	2008-08-31 02:01:22 UTC (rev 16315)
@@ -204,36 +204,9 @@
   /*   Do not #undef these macros here since the build system might define */
   /*   them for certain configurations only.                               */
   /*                                                                       */
-/* #define  FT_EXPORT(x)       extern x */
-/* #define  FT_EXPORT_DEF(x)   x */
-#ifndef __GNUC__
-# define __DLL_IMPORT__  __declspec(dllimport)
-# define __DLL_EXPORT__  __declspec(dllexport)
-#else
-# define __DLL_IMPORT__  __attribute__((dllimport)) extern
-# define __DLL_EXPORT__  __attribute__((dllexport)) extern
-#endif 
+#define  FT_EXPORT(x)       extern x 
+#define  FT_EXPORT_DEF(x)   x 
 
-#if (defined __WIN32__) || (defined _WIN32)
-# ifdef BUILD_FREETYPE2_DLL
-#  define FREETYPE2_DLL_IMPEXP     __DLL_EXPORT__
-# elif defined(FREETYPE2_STATIC)
-#  define FREETYPE2_DLL_IMPEXP      
-# elif defined (USE_FREETYPE2_DLL)
-#  define FREETYPE2_DLL_IMPEXP     __DLL_IMPORT__
-# elif defined (USE_FREETYPE2_STATIC)
-#  define FREETYPE2_DLL_IMPEXP      
-# else /* assume USE_FREETYPE2_DLL */
-#  define FREETYPE2_DLL_IMPEXP     __DLL_IMPORT__
-# endif
-#else /* __WIN32__ */
-# define FREETYPE2_DLL_IMPEXP  
-#endif
- 
-#define FT_EXPORT(x)    FREETYPE2_DLL_IMPEXP x
-#define FT_BASE(x)      FREETYPE2_DLL_IMPEXP x
-
-
   /*************************************************************************/
   /*                                                                       */
   /* Glyph Postscript Names handling                                       */

Modified: trunk/lib/win64/freetype/lib/freetype2ST.lib
===================================================================
(Binary files differ)