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.

ChangeLog

@@ -1,16 +1,20 @@
 2000-12-13  David Turner <david.turner@freetype.org>
 
 	* 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
 	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/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..
+	* 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.
 
 2000-12-13  Werner Lemberg  <wl@gnu.org>
 

builds/compiler/intelc.mk

@@ -63,10 +63,10 @@ T := /Fo
 #   ANSI compliance.
 #
 #   Note that the Intel C/C++ compiler version 4.5 complains about
-#   the use of FT_FIELD_OFFSET with "value must be arithmetic type !!"
-#   this really looks like a bug in the compiler because the macro
+#   the use of FT_FIELD_OFFSET with "value must be arithmetic type"!
+#   This really looks like a bug in the compiler because the macro
 #   _does_ compute an arithmetic value, so we disable this warning
-#   with "/Qwd32" !!
+#   with "/Qwd32".
 #
 ifndef CFLAGS
   CFLAGS := /nologo /c /Ox /G5 /W3 /Qwd32

builds/compiler/visualc.mk

@@ -70,6 +70,7 @@ endif
 #
 ANSIFLAGS := /Za
 
+
 # Library linking
 #
 #CLEAN_LIBRARY =

builds/compiler/watcom.mk

@@ -17,12 +17,14 @@
 #
 CC := wcc386
 
+
 # The object file extension (for standard and static libraries).  This can be
 # .o, .tco, .obj, etc., depending on the platform.
 #
 O  := obj
 SO := obj
 
+
 # The library file extension (for standard and static libraries).  This can
 # be .a, .lib, etc., depending on the platform.
 #

builds/win32/detect.mk

@@ -104,9 +104,10 @@ ifeq ($(PLATFORM),ansi)
         CC          := icl
         intelc: setup
       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++
         CONFIG_FILE := w32-icc.mk

builds/win32/w32-intl.mk

@@ -1,5 +1,5 @@
 #
-# FreeType 2 Intel C/C++ on Win32
+# FreeType 2 configuration rules for Intel C/C++ on Win32
 #
 
 

include/freetype/internal/cfftypes.h

@@ -20,9 +20,11 @@
 #ifndef __CFFTYPES_H__
 #define __CFFTYPES_H__
 
+
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
+
 FT_BEGIN_HEADER
 
 

src/base/ftdebug.c

@@ -107,7 +107,9 @@
 
 #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;
 
+
 /* END */