Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/evas

Dir     : e17/libs/evas/src/lib/engines/common


Modified Files:
        Makefile.am evas_font_load.c 


Log Message:


cross-compile cleanly damnit!

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 30 Jan 2004 05:46:57 -0000      1.4
+++ Makefile.am 17 Feb 2004 07:12:37 -0000      1.5
@@ -5,13 +5,12 @@
 # A list of all the files in the current directory which can be regenerated
 MAINTAINERCLEANFILES = Makefile.in
 
-LDFLAGS                     = -L/usr/local/lib
+LDFLAGS                     = 
 INCLUDES            = @freetype_cflags@ \
                        -I. \
                       -I$(top_srcdir)/src/lib \
-                      -I$(top_srcdir)/src/lib/include \
-                      -I$(includedir) \
-                       -I/usr/local/include
+                      -I$(top_srcdir)/src/lib/include
+                       
 
 noinst_LTLIBRARIES      = libevas_engine_common.la
 libevas_engine_common_la_SOURCES  = \
===================================================================
RCS file: 
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_font_load.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- evas_font_load.c    26 Jan 2004 08:20:59 -0000      1.11
+++ evas_font_load.c    17 Feb 2004 07:12:37 -0000      1.12
@@ -71,21 +71,36 @@
        return NULL;
      }
 #if 0 /* debugging to look at charmaps in a ttf */
-   printf("%i\n", fs->ft.face->num_charmaps);
+   printf("charmaps [%s]: %i\n", name, fs->ft.face->num_charmaps);
      {
        int i;
        
        for (i = 0; i < fs->ft.face->num_charmaps; i++)
          {
-            printf("%i: %x, %c\n", 
-                   i, fs->ft.face->charmaps[i]->encoding,
-                   fs->ft.face->charmaps[i]->encoding);
+            printf("  %i: %x, ", 
+                   i, fs->ft.face->charmaps[i]->encoding);
+            if      (fs->ft.face->charmaps[i]->encoding == FT_ENCODING_NONE)          
 printf("none\n");
+            else if (fs->ft.face->charmaps[i]->encoding == FT_ENCODING_UNICODE)       
 printf("unicode\n");
+            else if (fs->ft.face->charmaps[i]->encoding == FT_ENCODING_MS_SYMBOL)     
 printf("ms_symbol\n");
+            else if (fs->ft.face->charmaps[i]->encoding == FT_ENCODING_SJIS)          
 printf("sjis\n");
+            else if (fs->ft.face->charmaps[i]->encoding == FT_ENCODING_GB2312)        
 printf("gb3212\n");
+            else if (fs->ft.face->charmaps[i]->encoding == FT_ENCODING_BIG5)          
 printf("big5\n");
+            else if (fs->ft.face->charmaps[i]->encoding == FT_ENCODING_WANSUNG)       
 printf("wansung\n");
+            else if (fs->ft.face->charmaps[i]->encoding == FT_ENCODING_JOHAB)         
 printf("johab\n");
+            else if (fs->ft.face->charmaps[i]->encoding == FT_ENCODING_ADOBE_LATIN_1) 
 printf("adobe_latin_1\n");
+            else if (fs->ft.face->charmaps[i]->encoding == 
FT_ENCODING_ADOBE_STANDARD) printf("adobe_standard\n");
+            else if (fs->ft.face->charmaps[i]->encoding == FT_ENCODING_ADOBE_EXPERT)  
 printf("adobe_expert\n");
+            else if (fs->ft.face->charmaps[i]->encoding == FT_ENCODING_ADOBE_CUSTOM)  
 printf("adobe_custom\n");
+            else if (fs->ft.face->charmaps[i]->encoding == FT_ENCODING_APPLE_ROMAN)   
 printf("apple_roman\n");
+            else                                                                      
 printf("UNKNOWN");
+            printf("\n");
          }
      }
 #endif   
    error = FT_Select_Charmap(fs->ft.face, ft_encoding_unicode);
    if (error)
      {
+       printf("cant select unicode!\n");
 /* disable this for now...
        error = FT_Select_Charmap(fs->ft.face, ft_encoding_latin_2);
        if (error)




-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to