forked from minhngoc25a/freetype2
include/freetype/internal/internal.h: Fixed header inclusion macros
to use direct definitions. This is the only way to do these things in a portable way :-( The rest of the code should follow shortly though everything compiles now. * builds/compiler/intelc.mk, builds/compiler/watcom.mk: New files. * builds/win32/detect.mk: Added support for the Intel C/C++ compiler, as well as _preliminary_ (read: doesn't work!) support for Watcom. Also added a new setup target. Type "make setup list" for a list of supported command-line compilers on Win32. * src/base/ftdebug.c: Added dummy symbol to avoid empty file if conditionals are off.
This commit is contained in:
parent
170c0d4c0d
commit
63408a1299
22
ChangeLog
22
ChangeLog
|
@ -1,16 +1,20 @@
|
||||||
2000-12-13 David Turner <david.turner@freetype.org>
|
2000-12-13 David Turner <david.turner@freetype.org>
|
||||||
|
|
||||||
* include/freetype/config/ft2build.h,
|
* include/freetype/config/ft2build.h,
|
||||||
include/freetype/internal/internal.h: fixed header inclusion macros
|
include/freetype/internal/internal.h: Fixed header inclusion macros
|
||||||
to use direct definitions. This is the only way to do these things
|
to use direct definitions. This is the only way to do these things
|
||||||
in a portable way :-( The rest of the code should follow shortly
|
in a portable way :-( The rest of the code should follow shortly
|
||||||
though everything compiles now..
|
though everything compiles now.
|
||||||
|
|
||||||
* builds/compiler/intelc.mk, builds/compiler/watcom.mk,
|
* builds/compiler/intelc.mk, builds/compiler/watcom.mk: New files.
|
||||||
builds/win32/detect.mk: added support for the Intel C/C++ compiler,
|
|
||||||
as well as _preliminary_ (read: doesn't work !!) support for Watcom.
|
* builds/win32/detect.mk: Added support for the Intel C/C++
|
||||||
Also added a new setup target. Type "make setup list" for a list
|
compiler, as well as _preliminary_ (read: doesn't work!) support for
|
||||||
of supported command-line compilers on Win32..
|
Watcom. Also added a new setup target. Type "make setup list" for
|
||||||
|
a list of supported command-line compilers on Win32.
|
||||||
|
|
||||||
|
* src/base/ftdebug.c: Added dummy symbol to avoid empty file if
|
||||||
|
conditionals are off.
|
||||||
|
|
||||||
2000-12-13 Werner Lemberg <wl@gnu.org>
|
2000-12-13 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
|
|
@ -63,10 +63,10 @@ T := /Fo
|
||||||
# ANSI compliance.
|
# ANSI compliance.
|
||||||
#
|
#
|
||||||
# Note that the Intel C/C++ compiler version 4.5 complains about
|
# Note that the Intel C/C++ compiler version 4.5 complains about
|
||||||
# the use of FT_FIELD_OFFSET with "value must be arithmetic type !!"
|
# the use of FT_FIELD_OFFSET with "value must be arithmetic type"!
|
||||||
# this really looks like a bug in the compiler because the macro
|
# This really looks like a bug in the compiler because the macro
|
||||||
# _does_ compute an arithmetic value, so we disable this warning
|
# _does_ compute an arithmetic value, so we disable this warning
|
||||||
# with "/Qwd32" !!
|
# with "/Qwd32".
|
||||||
#
|
#
|
||||||
ifndef CFLAGS
|
ifndef CFLAGS
|
||||||
CFLAGS := /nologo /c /Ox /G5 /W3 /Qwd32
|
CFLAGS := /nologo /c /Ox /G5 /W3 /Qwd32
|
||||||
|
|
|
@ -70,6 +70,7 @@ endif
|
||||||
#
|
#
|
||||||
ANSIFLAGS := /Za
|
ANSIFLAGS := /Za
|
||||||
|
|
||||||
|
|
||||||
# Library linking
|
# Library linking
|
||||||
#
|
#
|
||||||
#CLEAN_LIBRARY =
|
#CLEAN_LIBRARY =
|
||||||
|
|
|
@ -17,12 +17,14 @@
|
||||||
#
|
#
|
||||||
CC := wcc386
|
CC := wcc386
|
||||||
|
|
||||||
|
|
||||||
# The object file extension (for standard and static libraries). This can be
|
# The object file extension (for standard and static libraries). This can be
|
||||||
# .o, .tco, .obj, etc., depending on the platform.
|
# .o, .tco, .obj, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
O := obj
|
O := obj
|
||||||
SO := obj
|
SO := obj
|
||||||
|
|
||||||
|
|
||||||
# The library file extension (for standard and static libraries). This can
|
# The library file extension (for standard and static libraries). This can
|
||||||
# be .a, .lib, etc., depending on the platform.
|
# be .a, .lib, etc., depending on the platform.
|
||||||
#
|
#
|
||||||
|
|
|
@ -27,11 +27,11 @@ ifeq ($(PLATFORM),ansi)
|
||||||
is_windows := 1
|
is_windows := 1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# We test for the COMSPEC environment variable, then run the `ver'
|
# We test for the COMSPEC environment variable, then run the `ver'
|
||||||
# command-line program to see if its output contains the word `Windows'.
|
# command-line program to see if its output contains the word `Windows'.
|
||||||
#
|
#
|
||||||
# If this is true, we are running a win32 platform (or an emulation).
|
# If this is true, we are running a win32 platform (or an emulation).
|
||||||
#
|
#
|
||||||
else
|
else
|
||||||
ifneq ($(OSTYPE),cygwin)
|
ifneq ($(OSTYPE),cygwin)
|
||||||
ifdef COMSPEC
|
ifdef COMSPEC
|
||||||
|
@ -42,29 +42,29 @@ ifeq ($(PLATFORM),ansi)
|
||||||
|
|
||||||
ifdef is_windows
|
ifdef is_windows
|
||||||
|
|
||||||
PLATFORM := win32
|
PLATFORM := win32
|
||||||
DELETE := del
|
DELETE := del
|
||||||
COPY := copy
|
COPY := copy
|
||||||
CONFIG_FILE := none
|
CONFIG_FILE := none
|
||||||
|
|
||||||
ifneq ($(findstring list,$(MAKECMDGOALS)),) # test for the "list" target
|
ifneq ($(findstring list,$(MAKECMDGOALS)),) # test for the "list" target
|
||||||
|
|
||||||
.PHONY: dump_target_list setup list
|
.PHONY: dump_target_list setup list
|
||||||
|
|
||||||
dump_target_list:
|
dump_target_list:
|
||||||
@echo ÿ
|
@echo ÿ
|
||||||
@echo $(PROJECT_TITLE) build system -- supported compilers
|
@echo $(PROJECT_TITLE) build system -- supported compilers
|
||||||
@echo ÿ
|
@echo ÿ
|
||||||
@echo Several command-line compilers are supported on Win32:
|
@echo Several command-line compilers are supported on Win32:
|
||||||
@echo ÿ
|
@echo ÿ
|
||||||
@echo ÿÿmake setupÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿgcc (with Mingw)
|
@echo ÿÿmake setupÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿgcc (with Mingw)
|
||||||
@echo ÿÿmake setup visualcÿÿÿÿÿÿÿÿÿÿÿÿÿMicrosoft Visual C++
|
@echo ÿÿmake setup visualcÿÿÿÿÿÿÿÿÿÿÿÿÿMicrosoft Visual C++
|
||||||
@echo ÿÿmake setup bcc32ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿBorland C/C++
|
@echo ÿÿmake setup bcc32ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿBorland C/C++
|
||||||
@echo ÿÿmake setup lccÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿWin32-LCC
|
@echo ÿÿmake setup lccÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿWin32-LCC
|
||||||
@echo ÿÿmake setup intelcÿÿÿÿÿÿÿÿÿÿÿÿÿÿIntel C/C++
|
@echo ÿÿmake setup intelcÿÿÿÿÿÿÿÿÿÿÿÿÿÿIntel C/C++
|
||||||
@echo ÿ
|
@echo ÿ
|
||||||
|
|
||||||
setup: dump_target_list
|
setup: dump_target_list
|
||||||
|
|
||||||
else # test "list"
|
else # test "list"
|
||||||
|
|
||||||
|
@ -104,9 +104,10 @@ ifeq ($(PLATFORM),ansi)
|
||||||
CC := icl
|
CC := icl
|
||||||
intelc: setup
|
intelc: setup
|
||||||
endif
|
endif
|
||||||
#
|
|
||||||
# The following build targets are not officialy supported for now
|
#
|
||||||
#
|
# The following build targets are not officially supported for now
|
||||||
|
#
|
||||||
|
|
||||||
ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++
|
ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++
|
||||||
CONFIG_FILE := w32-icc.mk
|
CONFIG_FILE := w32-icc.mk
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
#
|
#
|
||||||
# FreeType 2 Intel C/C++ on Win32
|
# FreeType 2 configuration rules for Intel C/C++ on Win32
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,7 @@ FT_BEGIN_HEADER
|
||||||
|
|
||||||
|
|
||||||
/* maximum number of chunk sets in a given chunk cache */
|
/* maximum number of chunk sets in a given chunk cache */
|
||||||
#define FTC_MAX_CHUNK_SETS 16
|
#define FTC_MAX_CHUNK_SETS 16
|
||||||
|
|
||||||
|
|
||||||
typedef struct FTC_ChunkNodeRec_* FTC_ChunkNode;
|
typedef struct FTC_ChunkNodeRec_* FTC_ChunkNode;
|
||||||
|
|
|
@ -46,25 +46,25 @@ FT_BEGIN_HEADER
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
#define FTC_IMAGE_FORMAT( x ) ( (x) & 7 )
|
#define FTC_IMAGE_FORMAT( x ) ( (x) & 7 )
|
||||||
|
|
||||||
|
|
||||||
#define ftc_image_format_bitmap 0
|
#define ftc_image_format_bitmap 0
|
||||||
#define ftc_image_format_outline 1
|
#define ftc_image_format_outline 1
|
||||||
|
|
||||||
#define ftc_image_flag_monochrome 16
|
#define ftc_image_flag_monochrome 16
|
||||||
#define ftc_image_flag_unhinted 32
|
#define ftc_image_flag_unhinted 32
|
||||||
#define ftc_image_flag_autohinted 64
|
#define ftc_image_flag_autohinted 64
|
||||||
#define ftc_image_flag_unscaled 128
|
#define ftc_image_flag_unscaled 128
|
||||||
#define ftc_image_flag_no_sbits 256
|
#define ftc_image_flag_no_sbits 256
|
||||||
|
|
||||||
/* monochrome bitmap */
|
/* monochrome bitmap */
|
||||||
#define ftc_image_mono ftc_image_format_bitmap | \
|
#define ftc_image_mono ftc_image_format_bitmap | \
|
||||||
ftc_image_flag_monochrome
|
ftc_image_flag_monochrome
|
||||||
/* anti-aliased bitmap */
|
/* anti-aliased bitmap */
|
||||||
#define ftc_image_grays ftc_image_format_bitmap
|
#define ftc_image_grays ftc_image_format_bitmap
|
||||||
/* scaled outline */
|
/* scaled outline */
|
||||||
#define ftc_image_outline ftc_image_format_outline
|
#define ftc_image_outline ftc_image_format_outline
|
||||||
|
|
||||||
|
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
|
|
|
@ -47,13 +47,13 @@
|
||||||
|
|
||||||
|
|
||||||
/* this macro is used to enclose its argument in brackets */
|
/* this macro is used to enclose its argument in brackets */
|
||||||
#define FT2_ENCLOSE(x) <x>
|
#define FT2_ENCLOSE(x) <x>
|
||||||
|
|
||||||
/* this macro is used to join a path and a file name */
|
/* this macro is used to join a path and a file name */
|
||||||
#define FT2_JOINPATH(d,x) d/x
|
#define FT2_JOINPATH(d,x) d/x
|
||||||
|
|
||||||
/* this macro is used to format a path in "<d/x>" format easily */
|
/* this macro is used to format a path in "<d/x>" format easily */
|
||||||
#define FT2_PUBLIC_PATH(d,x) FT2_ENCLOSE(d/x)
|
#define FT2_PUBLIC_PATH(d,x) FT2_ENCLOSE(d/x)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -42,13 +42,13 @@
|
||||||
FT_BEGIN_HEADER
|
FT_BEGIN_HEADER
|
||||||
|
|
||||||
|
|
||||||
#define FT_CACHE_MANAGER_H FT2_PUBLIC_FILE(cache/ftcmanag.h)
|
#define FT_CACHE_MANAGER_H FT2_PUBLIC_FILE(cache/ftcmanag.h)
|
||||||
#define FT_CACHE_IMAGE_H FT2_PUBLIC_FILE(cache/ftcimage.h)
|
#define FT_CACHE_IMAGE_H FT2_PUBLIC_FILE(cache/ftcimage.h)
|
||||||
#define FT_CACHE_SMALL_BITMAPS_H FT2_PUBLIC_FILE(cache/ftcsbits.h)
|
#define FT_CACHE_SMALL_BITMAPS_H FT2_PUBLIC_FILE(cache/ftcsbits.h)
|
||||||
|
|
||||||
#define FT_CACHE_INTERNAL_LRU_H FT2_PUBLIC_FILE(cache/ftlru.h)
|
#define FT_CACHE_INTERNAL_LRU_H FT2_PUBLIC_FILE(cache/ftlru.h)
|
||||||
#define FT_CACHE_INTERNAL_GLYPH_H FT2_PUBLIC_FILE(cache/ftcglyph.h)
|
#define FT_CACHE_INTERNAL_GLYPH_H FT2_PUBLIC_FILE(cache/ftcglyph.h)
|
||||||
#define FT_CACHE_INTERNAL_CHUNK_H FT2_PUBLIC_FILE(cache/ftcchunk.h)
|
#define FT_CACHE_INTERNAL_CHUNK_H FT2_PUBLIC_FILE(cache/ftcchunk.h)
|
||||||
|
|
||||||
|
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
|
|
|
@ -20,8 +20,10 @@
|
||||||
#ifndef __CFFTYPES_H__
|
#ifndef __CFFTYPES_H__
|
||||||
#define __CFFTYPES_H__
|
#define __CFFTYPES_H__
|
||||||
|
|
||||||
#include <ft2build.h>
|
|
||||||
#include FT_FREETYPE_H
|
#include <ft2build.h>
|
||||||
|
#include FT_FREETYPE_H
|
||||||
|
|
||||||
|
|
||||||
FT_BEGIN_HEADER
|
FT_BEGIN_HEADER
|
||||||
|
|
||||||
|
|
|
@ -67,8 +67,8 @@ FT_BEGIN_HEADER
|
||||||
} WinResourceInfo;
|
} WinResourceInfo;
|
||||||
|
|
||||||
|
|
||||||
#define WINFNT_MZ_MAGIC 0x5A4D
|
#define WINFNT_MZ_MAGIC 0x5A4D
|
||||||
#define WINFNT_NE_MAGIC 0x454E
|
#define WINFNT_NE_MAGIC 0x454E
|
||||||
|
|
||||||
|
|
||||||
typedef struct WinFNT_Header_
|
typedef struct WinFNT_Header_
|
||||||
|
|
|
@ -20,8 +20,8 @@
|
||||||
/***************************************************************************/
|
/***************************************************************************/
|
||||||
|
|
||||||
|
|
||||||
#include <ft2build.h>
|
#include <ft2build.h>
|
||||||
#include FT_SOURCE_FILE(autohint,ahangles.h)
|
#include FT_SOURCE_FILE(autohint,ahangles.h)
|
||||||
|
|
||||||
|
|
||||||
/* the following table has been automatically generated with */
|
/* the following table has been automatically generated with */
|
||||||
|
|
|
@ -23,8 +23,8 @@
|
||||||
#define __AHMODULE_H__
|
#define __AHMODULE_H__
|
||||||
|
|
||||||
|
|
||||||
#include <ft2build.h>
|
#include <ft2build.h>
|
||||||
#include FT_MODULE_H
|
#include FT_MODULE_H
|
||||||
|
|
||||||
|
|
||||||
FT_BEGIN_HEADER
|
FT_BEGIN_HEADER
|
||||||
|
|
|
@ -107,7 +107,9 @@
|
||||||
|
|
||||||
#endif /* FT_DEBUG_LEVEL_TRACE || FT_DEBUG_LEVEL_ERROR */
|
#endif /* FT_DEBUG_LEVEL_TRACE || FT_DEBUG_LEVEL_ERROR */
|
||||||
|
|
||||||
/* needed by pedantic ANSI compilers */
|
|
||||||
|
/* ANSI C doesn't allow empty files, so we insert a dummy symbol */
|
||||||
extern const int ft_debug_dummy;
|
extern const int ft_debug_dummy;
|
||||||
|
|
||||||
|
|
||||||
/* END */
|
/* END */
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
#include <string.h> /* memcmp() */
|
#include <string.h> /* memcmp() */
|
||||||
|
|
||||||
|
|
||||||
#define FTC_SBITSET_ELEMENT_COUNT 16
|
#define FTC_SBITSET_ELEMENT_COUNT 16
|
||||||
|
|
||||||
|
|
||||||
typedef struct FTC_SBitSetRec_
|
typedef struct FTC_SBitSetRec_
|
||||||
|
|
|
@ -442,7 +442,7 @@
|
||||||
static const CFF_Field_Handler cff_field_handlers[] =
|
static const CFF_Field_Handler cff_field_handlers[] =
|
||||||
{
|
{
|
||||||
|
|
||||||
#include FT_SOURCE_FILE(cff,cfftoken.h)
|
#include FT_SOURCE_FILE(cff,cfftoken.h)
|
||||||
|
|
||||||
{ 0, 0, 0, 0, 0, 0, 0 }
|
{ 0, 0, 0, 0, 0, 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
|
@ -31,8 +31,8 @@
|
||||||
/* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */
|
/* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */
|
||||||
/* messages during execution. */
|
/* messages during execution. */
|
||||||
/* */
|
/* */
|
||||||
#undef FT_COMPONENT
|
#undef FT_COMPONENT
|
||||||
#define FT_COMPONENT trace_cidobjs
|
#define FT_COMPONENT trace_cidobjs
|
||||||
|
|
||||||
|
|
||||||
/*************************************************************************/
|
/*************************************************************************/
|
||||||
|
|
|
@ -18,18 +18,18 @@
|
||||||
|
|
||||||
#define FT_MAKE_OPTION_SINGLE_OBJECT
|
#define FT_MAKE_OPTION_SINGLE_OBJECT
|
||||||
|
|
||||||
#include <ft2build.h>
|
#include <ft2build.h>
|
||||||
#include FT_SOURCE_FILE(sfnt,ttload.c)
|
#include FT_SOURCE_FILE(sfnt,ttload.c)
|
||||||
#include FT_SOURCE_FILE(sfnt,ttcmap.c)
|
#include FT_SOURCE_FILE(sfnt,ttcmap.c)
|
||||||
#include FT_SOURCE_FILE(sfnt,sfobjs.c)
|
#include FT_SOURCE_FILE(sfnt,sfobjs.c)
|
||||||
#include FT_SOURCE_FILE(sfnt,sfdriver.c)
|
#include FT_SOURCE_FILE(sfnt,sfdriver.c)
|
||||||
|
|
||||||
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
|
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
|
||||||
#include FT_SOURCE_FILE(sfnt,ttsbit.c)
|
#include FT_SOURCE_FILE(sfnt,ttsbit.c)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
|
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
|
||||||
#include FT_SOURCE_FILE(sfnt,ttpost.c)
|
#include FT_SOURCE_FILE(sfnt,ttpost.c)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -61,7 +61,7 @@
|
||||||
/* table of Mac names. Thus, it is possible to build a version of */
|
/* table of Mac names. Thus, it is possible to build a version of */
|
||||||
/* FreeType without the Type 1 driver & PSNames module. */
|
/* FreeType without the Type 1 driver & PSNames module. */
|
||||||
|
|
||||||
#define MAC_NAME( x ) TT_Post_Default_Names[x]
|
#define MAC_NAME( x ) TT_Post_Default_Names[x]
|
||||||
|
|
||||||
/* the 258 default Mac PS glyph names */
|
/* the 258 default Mac PS glyph names */
|
||||||
|
|
||||||
|
|
|
@ -122,11 +122,11 @@
|
||||||
|
|
||||||
#else /* _STANDALONE_ */
|
#else /* _STANDALONE_ */
|
||||||
|
|
||||||
#include <ft2build.h>
|
#include <ft2build.h>
|
||||||
#include FT_SOURCE_FILE(smooth,ftgrays.h)
|
#include FT_SOURCE_FILE(smooth,ftgrays.h)
|
||||||
#include FT_INTERNAL_OBJECTS_H
|
#include FT_INTERNAL_OBJECTS_H
|
||||||
#include FT_INTERNAL_DEBUG_H
|
#include FT_INTERNAL_DEBUG_H
|
||||||
#include FT_OUTLINE_H
|
#include FT_OUTLINE_H
|
||||||
|
|
||||||
#define ErrRaster_Invalid_Mode FT_Err_Cannot_Render_Glyph
|
#define ErrRaster_Invalid_Mode FT_Err_Cannot_Render_Glyph
|
||||||
#define ErrRaster_Invalid_Outline FT_Err_Invalid_Outline
|
#define ErrRaster_Invalid_Outline FT_Err_Invalid_Outline
|
||||||
|
|
|
@ -6841,8 +6841,8 @@
|
||||||
FT_Byte opcode = CUR.opcode;
|
FT_Byte opcode = CUR.opcode;
|
||||||
|
|
||||||
|
|
||||||
#undef ARRAY_BOUND_ERROR
|
#undef ARRAY_BOUND_ERROR
|
||||||
#define ARRAY_BOUND_ERROR goto Set_Invalid_Ref
|
#define ARRAY_BOUND_ERROR goto Set_Invalid_Ref
|
||||||
|
|
||||||
|
|
||||||
switch ( opcode )
|
switch ( opcode )
|
||||||
|
|
Loading…
Reference in New Issue