* src/base/Jamfile, src/base/rules.mk, vms_make.com: adding 'ftlcdfil.c' to the list of compiled source files
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298
diff --git a/ChangeLog b/ChangeLog
index 20e6000..2bf75af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
* include/freetype/config/ftheader.h: adding FT_LCD_FILTER_H
macro that points to <freetype/ftlcdfil.h>
+ * src/base/Jamfile, src/base/rules.mk, vms_make.com: adding
+ 'ftlcdfil.c' to the list of compiled source files
+
2006-09-26 David Bustin
* src/pfr/pfrobjs.c (pfr_face_get_kerning): Skip adjustment bytes
diff --git a/src/base/rules.mk b/src/base/rules.mk
index bbc6cb7..32cdeb1 100644
--- a/src/base/rules.mk
+++ b/src/base/rules.mk
@@ -42,6 +42,7 @@ BASE_SRC := $(BASE_DIR)/ftapi.c \
$(BASE_DIR)/ftrfork.c \
$(BASE_DIR)/ftstream.c \
$(BASE_DIR)/fttrigon.c \
+ $(BASE_DIR)/ftlcdfil.c \
$(BASE_DIR)/ftutil.c
# Base layer `extensions' sources
diff --git a/vms_make.com b/vms_make.com
index 77eb1f4..5411ce3 100644
--- a/vms_make.com
+++ b/vms_make.com
@@ -15,24 +15,24 @@ $! config file VMSLIB.DAT. Please check the sample file, which is part of this
$! distribution, for the information you need to provide
$!
$! This procedure currently does support the following commandline options
-$! in arbitrary order
+$! in arbitrary order
$!
-$! * DEBUG - Compile modules with /noopt/debug and link shareable image
+$! * DEBUG - Compile modules with /noopt/debug and link shareable image
$! with /debug
$! * LOPTS - Options to be passed to the link command
$! * CCOPT - Options to be passed to the C compiler
$!
$! In case of problems with the install you might contact me at
-$! zinser@zinser.no-ip.info(preferred) or
+$! zinser@zinser.no-ip.info(preferred) or
$! zinser@sysdev.deutsche-boerse.com (work)
$!
$! Make procedure history for Freetype2
-$!
+$!
$!------------------------------------------------------------------------------
$! Version history
$! 0.01 20040401 First version to receive a number
$! 0.02 20041030 Add error handling, Freetype 2.1.9
-$!
+$!
$ on error then goto err_exit
$ true = 1
$ false = 0
@@ -83,12 +83,12 @@ $ gosub check_create_vmslib
$!
$! Create objects
$!
-$ if libdefs .nes. ""
-$ then
+$ if libdefs .nes. ""
+$ then
$ ccopt = ccopt + "/define=(" + f$extract(0,f$length(libdefs)-1,libdefs) + ")"
$ endif
$!
-$ if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -
+$ if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -
then s_case = true
$ gosub crea_mms
$!
@@ -103,7 +103,7 @@ $ if (file .nes. "")
$ then
$ if f$locate("DEMOS",file) .eqs. f$length(file) then write optf file
$ goto floop
-$ endif
+$ endif
$!
$ close optf
$!
@@ -117,7 +117,7 @@ $ call anal_obj_axp 'optfile' _link.opt
$ open/append optf 'optfile'
$ if s_case then WRITE optf "case_sensitive=YES"
$ close optf
-$ LINK_/NODEB/SHARE=[.lib]freetype2shr.exe -
+$ LINK_/NODEB/SHARE=[.lib]freetype2shr.exe -
'optfile'/opt,libs.opt/opt,_link.opt/opt
$ endif
$!
@@ -143,7 +143,7 @@ $ exit 2
$!
$!------------------------------------------------------------------------------
$!
-$! If MMS/MMK are available dump out the descrip.mms if required
+$! If MMS/MMK are available dump out the descrip.mms if required
$!
$CREA_MMS:
$ write sys$output "Creating descrip.mms files ..."
@@ -169,25 +169,25 @@ $ EOD
$ write out "CFLAGS = ", ccopt
$ copy sys$input: out
$ deck
-
+
all :
- define freetype [--.include.freetype]
- define psaux [-.psaux]
- define autofit [-.autofit]
- define autohint [-.autohint]
- define base [-.base]
- define cache [-.cache]
- define cff [-.cff]
- define cid [-.cid]
- define pcf [-.pcf]
- define psnames [-.psnames]
- define raster [-.raster]
- define sfnt [-.sfnt]
- define smooth [-.smooth]
- define truetype [-.truetype]
- define type1 [-.type1]
- define winfonts [-.winfonts]
+ define freetype [--.include.freetype]
+ define psaux [-.psaux]
+ define autofit [-.autofit]
+ define autohint [-.autohint]
+ define base [-.base]
+ define cache [-.cache]
+ define cff [-.cff]
+ define cid [-.cid]
+ define pcf [-.pcf]
+ define psnames [-.psnames]
+ define raster [-.raster]
+ define sfnt [-.sfnt]
+ define smooth [-.smooth]
+ define truetype [-.truetype]
+ define type1 [-.type1]
+ define winfonts [-.winfonts]
if f$search("lib.dir") .eqs. "" then create/directory [.lib]
set default [.builds.vms]
$(MMS)$(MMSQUALIFIERS)
@@ -357,7 +357,7 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include],[--.src.base]
OBJS=ftbase.obj,ftinit.obj,ftglyph.obj,ftdebug.obj,ftbdf.obj,ftmm.obj,\
fttype1.obj,ftxf86.obj,ftpfr.obj,ftstroke.obj,ftwinfnt.obj,ftbbox.obj,\
- ftbitmap.obj
+ ftbitmap.obj ftlcdfil.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
@@ -423,7 +423,7 @@ all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)
ftcache.obj : ftcache.c ftcbasic.c ftccache.c ftccmap.c ftcglyph.c ftcimage.c \
- ftcmanag.c ftcmru.c ftcsbits.c
+ ftcmanag.c ftcmru.c ftcsbits.c
# EOF
$ eod
@@ -1015,41 +1015,41 @@ $ len = f$length(cparm) - start
$ ccopt = ccopt + f$extract(start,len,cparm)
$ endif
$ if cparm .eqs. "LINK" then linkonly = true
-$ if f$locate("LOPTS=",cparm) .lt. f$length(cparm)
+$ if f$locate("LOPTS=",cparm) .lt. f$length(cparm)
$ then
$ start = f$locate("=",cparm) + 1
$ len = f$length(cparm) - start
$ lopts = lopts + f$extract(start,len,cparm)
$ endif
-$ if f$locate("CC=",cparm) .lt. f$length(cparm)
+$ if f$locate("CC=",cparm) .lt. f$length(cparm)
$ then
$ start = f$locate("=",cparm) + 1
$ len = f$length(cparm) - start
$ cc_com = f$extract(start,len,cparm)
- if (cc_com .nes. "DECC") .and. -
- (cc_com .nes. "VAXC") .and. -
+ if (cc_com .nes. "DECC") .and. -
+ (cc_com .nes. "VAXC") .and. -
(cc_com .nes. "GNUC")
$ then
$ write sys$output "Unsupported compiler choice ''cc_com' ignored"
$ write sys$output "Use DECC, VAXC, or GNUC instead"
-$ else
-$ if cc_com .eqs. "DECC" then its_decc = true
-$ if cc_com .eqs. "VAXC" then its_vaxc = true
-$ if cc_com .eqs. "GNUC" then its_gnuc = true
-$ endif
+$ else
+$ if cc_com .eqs. "DECC" then its_decc = true
+$ if cc_com .eqs. "VAXC" then its_vaxc = true
+$ if cc_com .eqs. "GNUC" then its_gnuc = true
+$ endif
$ endif
-$ if f$locate("MAKE=",cparm) .lt. f$length(cparm)
+$ if f$locate("MAKE=",cparm) .lt. f$length(cparm)
$ then
$ start = f$locate("=",cparm) + 1
$ len = f$length(cparm) - start
$ mmks = f$extract(start,len,cparm)
-$ if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS")
+$ if (mmks .eqs. "MMK") .or. (mmks .eqs. "MMS")
$ then
$ make = mmks
-$ else
+$ else
$ write sys$output "Unsupported make choice ''mmks' ignored"
$ write sys$output "Use MMK or MMS instead"
-$ endif
+$ endif
$ endif
$ i = i + 1
$ goto opt_loop
@@ -1062,7 +1062,7 @@ $!
$! Version history
$! 0.01 20040220 First version to receive a number
$! 0.02 20040229 Echo current procedure name; use general error exit handler
-$! Remove xpm hack -> Replaced by more general dnsrl handling
+$! Remove xpm hack -> Replaced by more general dnsrl handling
$CHECK_CREATE_VMSLIB:
$!
$ if f$search("VMSLIB.DAT") .eqs. ""
@@ -1078,18 +1078,18 @@ $ type/out=vmslib.dat sys$input
! - Lines starting with ! are treated as comments
! - Elements in a data line are separated by # signs
! - The elements need to be listed in the following order
-! 1.) Name of the Library (only used for informative messages
+! 1.) Name of the Library (only used for informative messages
! from vms_make.com)
! 2.) Location where the object library can be found
! 3.) Location where the include files for the library can be found
! 4.) Include file used to verify library location
-! 5.) CPP define to pass to the build to indicate availability of
+! 5.) CPP define to pass to the build to indicate availability of
! the library
!
-! Example: The following lines show how definitions
-! might look like. They are site specific and the locations of the
+! Example: The following lines show how definitions
+! might look like. They are site specific and the locations of the
! library and include files need almost certainly to be changed.
-!
+!
! Location: All of the libaries can be found at the following addresses
!
! ZLIB: http://zinser.no-ip.info/vms/sw/zlib.htmlx
@@ -1159,7 +1159,7 @@ $ if ((f$search("freetype:freetype.h") .nes. "") .and. -
$ then
$ write sys$output "Will use local definition of freetype logical"
$ else
-$ ft2elem = 0
+$ ft2elem = 0
$FT2_LOOP:
$ ft2srcdir = f$element(ft2elem,",",libsrc)
$ if f$search("''ft2srcdir'''testinc'") .nes. ""
@@ -1185,7 +1185,7 @@ $ else
$ ft2elem = ft2elem + 1
$ goto ft2_loop
$ endif
-$ endif
+$ endif
$ endif
$ goto LIB_LOOP
$END_LIB:
@@ -1193,7 +1193,7 @@ $ close libdata
$ return
$!------------------------------------------------------------------------------
$!
-$! Analyze Object files for OpenVMS AXP to extract Procedure and Data
+$! Analyze Object files for OpenVMS AXP to extract Procedure and Data
$! information to build a symbol vector for a shareable image
$! All the "brains" of this logic was suggested by Hartmut Becker
$! (Hartmut.Becker@compaq.com). All the bugs were introduced by me
@@ -1203,10 +1203,10 @@ $!
$! Version history
$! 0.01 20040006 Skip over shareable images in option file
$!
-$ ANAL_OBJ_AXP: Subroutine
+$ ANAL_OBJ_AXP: Subroutine
$ V = 'F$Verify(0)
$ SAY := "WRITE_ SYS$OUTPUT"
-$
+$
$ IF F$SEARCH("''P1'") .EQS. ""
$ THEN
$ SAY "ANAL_OBJ_AXP-E-NOSUCHFILE: Error, inputfile ''p1' not available"
@@ -1283,4 +1283,4 @@ $!
$ close libsf
$ EXIT_AA:
$ if V then set verify
-$ endsubroutine
+$ endsubroutine