Changeset 296 for branches


Ignore:
Timestamp:
Mar 19, 2010, 7:50:53 PM (12 years ago)
Author:
dmik
Message:

branches/kmk: Build fontconfig with GCC.

Location:
branches/kmk/poppler/fc-emulate-os2
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/kmk/poppler/fc-emulate-os2/Makefile.kmk

    r295 r296  
    1212# fontconfig emulation library
    1313#
    14 #fontconfig_TOOL        = GXX3OMF
    15 #fontconfig_CXXFLAGS    =
    16 fontconfig_TOOL         = OPENWATCOM
    17 fontconfig_CXXFLAGS     = -zq -zp=8 -bm -sg -ot -ox -xs -oh -xr -5 -fp5
     14fontconfig_TOOL         = GXX3OMF
     15fontconfig_CXXFLAGS     =
     16#fontconfig_TOOL                = OPENWATCOM
     17#fontconfig_CXXFLAGS    = -zq -zp=8 -bm -sg -ot -ox -xs -oh -xr -5 -fp5
    1818fontconfig_DEFS         = OS2
    1919fontconfig_INCS         = ../freetype2/include
  • branches/kmk/poppler/fc-emulate-os2/fontconfig/fontconfig.cpp

    r272 r296  
    2222#define INCL_DOS
    2323#define INCL_WIN
     24#if defined(__EMX__)
     25#define OS2EMX_PLAIN_CHAR
     26#endif
    2427#include <os2.h>
    2528
     
    2932
    3033#include <stdio.h>
     34#include <string.h>
     35
     36#if defined( __WATCOMC__ )
    3137#include <dos.h>
    32 #include <string.h>
     38#else
     39#include <io.h>
     40#include <sys/stat.h>
     41#endif
    3342
    3443#include "fontconfig.h"
     
    278287    char dir[ _MAX_DIR ];
    279288    char fname[ _MAX_FNAME ];
     289#if defined( __WATCOMC__ )
    280290    _splitpath( __argv[0], drive, dir, fname, NULL );
     291#else
     292    _execname( fullpath, sizeof(fullpath) );
     293    _splitpath( fullpath, drive, dir, fname, NULL );
     294#endif
    281295    strlwr( fname );
    282296    _makepath( fullpath, drive, dir, fname, ".fcf" );
  • branches/kmk/poppler/fc-emulate-os2/fontconfig/fontconfig.h

    r71 r296  
    2323#define _ERFONTCONFIG_H_
    2424
    25 typedef unsigned char   FcChar8;
    26 typedef unsigned short  FcChar16;
    27 typedef unsigned int    FcChar32;
    28 typedef int             FcBool;
     25typedef char    FcChar8;
     26typedef short   FcChar16;
     27typedef int     FcChar32;
     28typedef int     FcBool;
    2929
    3030
Note: See TracChangeset for help on using the changeset viewer.