freetype-commit
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Git][freetype/freetype][master] 3 commits: * src/smooth/ftgrays.c (FT_S

From: Werner Lemberg (@wl)
Subject: [Git][freetype/freetype][master] 3 commits: * src/smooth/ftgrays.c (FT_SSE2): Fix definition for VMS.
Date: Fri, 21 Jul 2023 19:45:09 +0000

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

  • 7c542d02
    by Jouk Jansen at 2023-07-21T21:31:28+02:00 
    * src/smooth/ftgrays.c (FT_SSE2): Fix definition for VMS.
  • f7ae7e88
    by Jouk Jansen at 2023-07-21T21:33:20+02:00 
    * vms_make.com: Fix typos.
  • 9e3c5d7e
    by Jouk Jansen at 2023-07-21T21:36:57+02:00 
    * vms_make.com: Provide separate library compiled with C++.

Some types on OpenVMS x86_64 (for example, `long') have different sizes
depending on whether compiled with either C or C++.  In particular,
X-Windows applications crash if linked with the C++ version.

This patch makes `vms_make.com` create a second version of the FreeType
library compiled with C++ if OpenVMS is running on the x86_64 platform.

2 changed files:

Changes:

  • src/smooth/ftgrays.c
    ... ... @@ -1006,10 +1006,11 @@ typedef ptrdiff_t FT_PtrDist;
    1006 1006 
        *
    1007 1007 
        * For other cases, using binary splits is actually slightly faster.
    1008 1008 
        */
    1009 
    -#if defined( __SSE2__ )                            || \
    1010 
    -    ( defined( __x86_64__ ) && !defined( __VMS ) ) || \
    1011 
    -    defined( _M_AMD64 )                            || \
    1012 
    -    ( defined( _M_IX86_FP ) && _M_IX86_FP >= 2 )
    1009 
    +#if ( defined( __SSE2__ )                          ||   \
    1010 
    +      defined( __x86_64__ )                        ||   \
    1011 
    +      defined( _M_AMD64 )                          ||   \
    1012 
    +      ( defined( _M_IX86_FP ) && _M_IX86_FP >= 2 ) ) && \
    1013 
    +    !defined( __VMS )
    1013 1014 
     #  define FT_SSE2 1
    1014 1015 
     #else
    1015 1016 
     #  define FT_SSE2 0

  • vms_make.com
    ... ... @@ -34,6 +34,13 @@ $! 0.01 20040401 First version to receive a number
    34 34 
     $! 0.02 20041030 Add error handling, FreeType 2.1.9
    35 35 
     $!
    36 36 
     $ on error then goto err_exit
    37 
    +$!
    38 
    +$! Get platform
    39 
    +$ vax      = f$getsyi("ARCH_NAME").eqs. "VAX"
    40 
    +$ axp      = f$getsyi("ARCH_NAME").eqs. "Alpha"
    41 
    +$ ia64     = f$getsyi("ARCH_NAME").eqs. "IA64"
    42 
    +$ x86_64   = f$getsyi("ARCH_NAME").eqs. "x86_64"
    43 
    +$!
    37 44 
     $ true  = 1
    38 45 
     $ false = 0
    39 46 
     $ tmpnam = "temp_" + f$getjpi("","pid")
    ... ... @@ -48,6 +55,7 @@ $! Setup variables holding "config" information
    48 55 
     $!
    49 56 
     $ Make    = ""
    50 57 
     $ ccopt   = "/name=(as_is,short)/float=ieee"
    58 
    +$ if ( x86_64 ) then cxxopt = "/name=(as_is,short)"
    51 59 
     $ lopts   = ""
    52 60 
     $ dnsrl   = ""
    53 61 
     $ aconf_in_file = "config.hin"
    ... ... @@ -74,10 +82,10 @@ $!
    74 82 
     $!
    75 83 
     $! Pull in external libraries
    76 84 
     $!
    77 
    -$ have_png = f$search("sys$library:libpng.olb/lib") .nes. ""
    85 
    +$ have_png = f$search("sys$library:libpng.olb") .nes. ""
    78 86 
     $ have_bz2 = f$search("sys$library:libbz2.olb") .nes. ""
    79 
    -$ have_z = f$search("sys$library:libpng.olb") .nes. ""
    80 
    -$ have_harfbuzz = f$search("") .nes. "sys$library:libharfbuzz.olb/lib"
    87 
    +$ have_z = f$search("sys$library:libz.olb") .nes. ""
    88 
    +$ have_harfbuzz = f$search("sys$library:libharfbuzz.olb") .nes. ""
    81 89 
     $!
    82 90 
     $ create libs.opt
    83 91 
     $ open/write libsf libs.opt
    ... ... @@ -86,34 +94,45 @@ $ if ( have_png ) then write libsf "sys$library:libpng.olb/lib"
    86 94 
     $ if ( have_bz2 ) then write libsf "sys$library:libbz2.olb/lib"
    87 95 
     $ if ( have_z ) then write libsf "sys$library:libz.olb/lib"
    88 96 
     $ close libsf
    97 
    +$ open/write libsf libs_cxx.opt
    98 
    +$ if ( have_harfbuzz ) then write libsf "sys$library:libharfbuzz.olb/lib"
    99 
    +$ if ( have_png ) then write libsf "sys$library:libpng_cxx.olb/lib"
    100 
    +$ if ( have_bz2 ) then write libsf "sys$library:libbz2_cxx.olb/lib"
    101 
    +$ if ( have_z ) then write libsf "sys$library:libz_cxx.olb/lib"
    102 
    +$ close libsf
    89 103 
     $!
    90 104 
     $! Create objects
    91 105 
     $!
    92 106 
     $ libdefs = "FT2_BUILD_LIBRARY,FT_CONFIG_OPTION_OLD_INTERNALS"
    93 
    -$ if ( have_bz2 ) then libdef=libdefs+",FT_CONFIG_OPTION_USE_BZIP2=1"
    94 
    -$ if ( have_png ) then libdef=libdefs+",FT_CONFIG_OPTION_USE_PNG=1"
    95 
    -$ if ( have_z ) then libdef=libdefs+",FT_CONFIG_OPTION_USE_ZLIB=1"
    96 
    -$ if ( have_harfbuzz ) then libdef=libdefs+",FT_CONFIG_OPTION_USE_HARFBUZZ=1"
    107 
    +$ if ( have_bz2 ) then libdefs=libdefs+",FT_CONFIG_OPTION_USE_BZIP2=1"
    108 
    +$ if ( have_png ) then libdefs=libdefs+",FT_CONFIG_OPTION_USE_PNG=1"
    109 
    +$ if ( have_z ) then libdefs=libdefs+",FT_CONFIG_OPTION_SYSTEM_ZLIB=1"
    110 
    +$ if ( have_harfbuzz ) then libdefs=libdefs+",FT_CONFIG_OPTION_USE_HARFBUZZ=1"
    97 111 
     $ if libdefs .nes. ""
    98 112 
     $ then
    99 
    -$   ccopt = ccopt + "/define=(" + f$extract(0,f$length(libdefs)-1,libdefs) + ")"
    113 
    +$   ccopt = ccopt + "/define=(" + libdefs + ")"
    114 
    +$ if ( x86_64 ) then cxxopt = cxxopt + "/define=(" + libdefs + ")"
    100 115 
     $ endif
    101 116 
     $!
    102 117 
     $ if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) -
    103 118 
         then s_case = true
    104 119 
     $ gosub crea_mms
    105 120 
     $!
    106 
    -$ 'Make' /macro=(comp_flags="''ccopt'")
    121 
    +$ if x86_64
    122 
    +$ then
    123 
    +$   'Make' /macro=(comp_flags="''ccopt'",cxxcomp_flags="''cxxopt'","X86=1")
    124 
    +$ else
    125 
    +$   'Make' /macro=(comp_flags="''ccopt'")
    126 
    +$ endif
    107 127 
     $ purge/nolog [...]descrip.mms
    108 128 
     $!
    109 129 
     $!
    110 130 
     $! Alpha & Itanium get a shareable image
    111 131 
     $!
    112 
    -$ If f$getsyi("HW_MODEL") .gt. 1024 .or. f$getsyi("HW_MODEL") .eq. 0
    132 
    +$ If .not. vax
    113 133 
     $ Then
    114 134 
     $   write sys$output "Creating freetype2shr.exe"
    115 135 
     $   library/extract=* [.lib]freetype.olb
    116 
    -$   pipe link/nodeb/noshare/noexe/map=libfreetype.map/full freetype.obj | copy sys$input nl:
    117 136 
     $   set def [.src.tools]
    118 137 
     $   cc apinames.c
    119 138 
     $   link apinames
    ... ... @@ -134,6 +153,22 @@ $ link/nodeb/share=[.lib]freetype2shr.exe/map=libfreetype.map/full -
    134 153 
           libfreetype/opt,freetype_vms/opt,libs/opt
    135 154 
     $   delete freetype.obj;*
    136 155 
     $ endif
    156 
    +$ if x86_64
    157 
    +$ then
    158 
    +$   write sys$output "Creating freetype2shr_cxx.exe"
    159 
    +$   library/extract=* [.lib]freetype_cxx.olb
    160 
    +$   open/write file  libfreetype_cxx.opt
    161 
    +$   write file "!"
    162 
    +$   write file "! libfreetype_cxx.opt generated by vms_make.com"
    163 
    +$   write file "!"
    164 
    +$   write file "IDENTIFICATION=""freetype2 2.0"""
    165 
    +$   write file "GSMATCH=LEQUAL,2,0
    166 
    +$   write file "freetype_cxx.obj"
    167 
    +$   close file
    168 
    +$   link/nodeb/share=[.lib]freetype2shr_cxx.exe/map=libfreetype_cxx.map/full -
    169 
    +      libfreetype_cxx/opt,freetype_vms/opt,libs_cxx/opt
    170 
    +$   delete freetype_cxx.obj;*
    171 
    +$ endif
    137 172 
     $!
    138 173 
     $ exit
    139 174 
     $!
    ... ... @@ -175,6 +210,7 @@ $ deck
    175 210 
     # fully.
    176 211 
     $ EOD
    177 212 
     $ write out "CFLAGS = ", ccopt
    213 
    +$ if x86_64 then write out "CXXFLAGS = ", cxxopt
    178 214 
     $ copy sys$input: out
    179 215 
     $ deck
    180 216
    ... ... @@ -276,22 +312,43 @@ $ deck
    276 312
    277 313
    278 314 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    315 
    +.ifdef X86
    316 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    317 
    +.endif
    279 318
    319 
    +.ifdef X86
    280 320 
     .c.obj :
    321 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    281 322 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    282 323 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    283 324 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    284 325 
     	cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    285 326 
     	$(MMS$TARGET_NAME)_64.c
    327 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    286 328 
     	delete $(MMS$TARGET_NAME)_64.c;*
    329 
    +.else
    330 
    +.c.obj :
    331 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    332 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    333 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    334 
    +	cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    335 
    +	$(MMS$TARGET_NAME)_64.c
    336 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    337 
    +.endif
    287 338
    288 339 
     OBJS=ftsystem.obj
    289 340
    290 341 
     OBJS64=ftsystem_64.obj
    291 342
    343 
    +OBJSCXX=ftsystem_cxx.obj
    344 
    +
    292 345 
     all : $(OBJS)
    293 346 
             library/create [--.lib]freetype.olb $(OBJS)
    294 347 
             library [--.lib]freetype.olb $(OBJS64)
    348 
    +.ifdef X86
    349 
    +        library/create [--.lib]freetype_cxx.olb $(OBJSCXX)
    350 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    351 
    +.endif
    295 352
    296 353 
     ftsystem.obj : ftsystem.c ftconfig.h
    297 354
    ... ... @@ -318,22 +375,43 @@ $ deck
    318 375 
     # fully.
    319 376
    320 377 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.autofit])
    378 
    +.ifdef X86
    379 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    380 
    +.endif
    321 381
    382 
    +.ifdef X86
    322 383 
     .c.obj :
    384 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    323 385 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    324 386 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    325 
    -	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    387 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map nl: exclude hb_
    326 388 
     	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    327 389 
     	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    390 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    391 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    392 
    +.else
    393 
    +.c.obj :
    394 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    395 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    396 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    397 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    398 
    +	$(MMS$TARGET_NAME)_64.c
    328 399 
     	delete $(MMS$TARGET_NAME)_64.c;*
    400 
    +.endif
    329 401
    330 402 
     OBJS=autofit.obj
    331 403
    332 404 
     OBJS64=autofit_64.obj
    333 405
    406 
    +OBJSCXX=autofit_cxx.obj
    407 
    +
    334 408 
     all : $(OBJS)
    335 409 
             library [--.lib]freetype.olb $(OBJS)
    336 410 
             library [--.lib]freetype.olb $(OBJS64)
    411 
    +.ifdef X86
    412 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    413 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    414 
    +.endif
    337 415
    338 416 
     # EOF
    339 417 
     $ eod
    ... ... @@ -359,14 +437,29 @@ $ deck
    359 437
    360 438
    361 439 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include],[--.src.base])
    440 
    +.ifdef X86
    441 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    442 
    +.endif
    362 443
    444 
    +.ifdef X86
    363 445 
     .c.obj :
    446 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    364 447 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    365 448 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    366 449 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    367 450 
     	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    368 451 
     	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    452 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    369 453 
     	delete $(MMS$TARGET_NAME)_64.c;*
    454 
    +.else
    455 
    +.c.obj :
    456 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    457 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    458 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    459 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    460 
    +	$(MMS$TARGET_NAME)_64.c
    461 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    462 
    +.endif
    370 463
    371 464 
     OBJS=ftbase.obj,\
    372 465 
          ftbbox.obj,\
    ... ... @@ -402,9 +495,30 @@ OBJS64=ftbase_64.obj,\
    402 495 
          fttype1_64.obj,\
    403 496 
          ftwinfnt_64.obj,ftpatent_64.obj,ftgxval_64.obj,ftotval_64.obj
    404 497
    498 
    +OBJSCXX=ftbase_cxx.obj,\
    499 
    +     ftbbox_cxx.obj,\
    500 
    +     ftbdf_cxx.obj,\
    501 
    +     ftbitmap_cxx.obj,\
    502 
    +     ftcid_cxx.obj,\
    503 
    +     ftdebug_cxx.obj,\
    504 
    +     ftfstype_cxx.obj,\
    505 
    +     ftgasp_cxx.obj,\
    506 
    +     ftglyph_cxx.obj,\
    507 
    +     ftinit_cxx.obj,\
    508 
    +     ftmm_cxx.obj,\
    509 
    +     ftpfr_cxx.obj,\
    510 
    +     ftstroke_cxx.obj,\
    511 
    +     ftsynth_cxx.obj,\
    512 
    +     fttype1_cxx.obj,\
    513 
    +     ftwinfnt_cxx.obj,ftpatent_cxx.obj,ftgxval_cxx.obj,ftotval_cxx.obj
    514 
    +
    405 515 
     all : $(OBJS)
    406 516 
             library [--.lib]freetype.olb $(OBJS)
    407 517 
             library [--.lib]freetype.olb $(OBJS64)
    518 
    +.ifdef X86
    519 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    520 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    521 
    +.endif
    408 522
    409 523 
     ftbase.obj : ftbase.c ftadvanc.c ftcalc.c ftcolor.c ftdbgmem.c fterrors.c\
    410 524 
     	ftfntfmt.c ftgloadr.c fthash.c ftlcdfil.c ftmac.c ftobjs.c ftoutln.c\
    ... ... @@ -435,22 +549,43 @@ $ deck
    435 549
    436 550
    437 551 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.bdf])
    552 
    +.ifdef X86
    553 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    554 
    +.endif
    438 555
    556 
    +.ifdef X86
    557 
    +.c.obj :
    558 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    559 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    560 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    561 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    562 
    +	cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    563 
    +	$(MMS$TARGET_NAME)_64.c
    564 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    565 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    566 
    +.else
    439 567 
     .c.obj :
    440 568 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    441 569 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    442 570 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    443 
    -	cc$(CFLAGS)/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    571 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    444 572 
     	$(MMS$TARGET_NAME)_64.c
    445 573 
     	delete $(MMS$TARGET_NAME)_64.c;*
    574 
    +.endif
    446 575
    447 576 
     OBJS=bdf.obj
    448 577
    449 578 
     OBJS64=bdf_64.obj
    450 579
    580 
    +OBJSCXX=bdf_cxx.obj
    581 
    +
    451 582 
     all : $(OBJS)
    452 583 
             library [--.lib]freetype.olb $(OBJS)
    453 584 
             library [--.lib]freetype.olb $(OBJS64)
    585 
    +.ifdef X86
    586 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    587 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    588 
    +.endif
    454 589
    455 590 
     # EOF
    456 591 
     $ eod
    ... ... @@ -476,22 +611,43 @@ $ deck
    476 611
    477 612
    478 613 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cache])/nowarn
    614 
    +.ifdef X86
    615 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    616 
    +.endif
    479 617
    618 
    +.ifdef X86
    619 
    +.c.obj :
    620 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    621 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    622 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    623 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    624 
    +	cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    625 
    +	$(MMS$TARGET_NAME)_64.c
    626 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    627 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    628 
    +.else
    480 629 
     .c.obj :
    481 630 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    482 631 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    483 632 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    484 
    -	cc$(CFLAGS)/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    633 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    485 634 
     	$(MMS$TARGET_NAME)_64.c
    486 635 
     	delete $(MMS$TARGET_NAME)_64.c;*
    636 
    +.endif
    487 637
    488 638 
     OBJS=ftcache.obj
    489 639
    490 640 
     OBJS64=ftcache_64.obj
    491 641
    642 
    +OBJSCXX=ftcache_cxx.obj
    643 
    +
    492 644 
     all : $(OBJS)
    493 645 
             library [--.lib]freetype.olb $(OBJS)
    494 646 
             library [--.lib]freetype.olb $(OBJS64)
    647 
    +.ifdef X86
    648 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    649 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    650 
    +.endif
    495 651
    496 652 
     ftcache.obj : ftcache.c ftcbasic.c ftccache.c ftccmap.c ftcglyph.c ftcimage.c \
    497 653 
     	ftcmanag.c ftcmru.c ftcsbits.c
    ... ... @@ -520,22 +676,43 @@ $ deck
    520 676
    521 677
    522 678 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cff])
    679 
    +.ifdef X86
    680 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    681 
    +.endif
    523 682
    683 
    +.ifdef X86
    524 684 
     .c.obj :
    685 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    525 686 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    526 687 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    527 688 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    528 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    529 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    689 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    690 
    +	$(MMS$TARGET_NAME)_64.c
    691 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    692 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    693 
    +.else
    694 
    +.c.obj :
    695 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    696 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    697 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    698 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    699 
    +	$(MMS$TARGET_NAME)_64.c
    530 700 
     	delete $(MMS$TARGET_NAME)_64.c;*
    701 
    +.endif
    531 702
    532 703 
     OBJS=cff.obj
    533 704
    534 705 
     OBJS64=cff_64.obj
    535 706
    707 
    +OBJSCXX=cff_cxx.obj
    708 
    +
    536 709 
     all : $(OBJS)
    537 710 
             library [--.lib]freetype.olb $(OBJS)
    538 711 
             library [--.lib]freetype.olb $(OBJS64)
    712 
    +.ifdef X86
    713 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    714 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    715 
    +.endif
    539 716
    540 717 
     # EOF
    541 718 
     $ eod
    ... ... @@ -561,22 +738,43 @@ $ deck
    561 738
    562 739
    563 740 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cid])
    741 
    +.ifdef X86
    742 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    743 
    +.endif
    564 744
    745 
    +.ifdef X86
    565 746 
     .c.obj :
    747 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    566 748 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    567 749 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    568 750 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    569 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    570 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    751 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    752 
    +	$(MMS$TARGET_NAME)_64.c
    753 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    571 754 
     	delete $(MMS$TARGET_NAME)_64.c;*
    755 
    +.else
    756 
    +.c.obj :
    757 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    758 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    759 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    760 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    761 
    +	$(MMS$TARGET_NAME)_64.c
    762 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    763 
    +.endif
    572 764
    573 765 
     OBJS=type1cid.obj
    574 766
    575 767 
     OBJS64=type1cid_64.obj
    576 768
    769 
    +OBJSCXX=type1cid_cxx.obj
    770 
    +
    577 771 
     all : $(OBJS)
    578 772 
             library [--.lib]freetype.olb $(OBJS)
    579 773 
             library [--.lib]freetype.olb $(OBJS64)
    774 
    +.ifdef X86
    775 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    776 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    777 
    +.endif
    580 778
    581 779 
     # EOF
    582 780 
     $ eod
    ... ... @@ -602,22 +800,43 @@ $ deck
    602 800
    603 801
    604 802 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.gxvalid])
    803 
    +.ifdef X86
    804 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    805 
    +.endif
    605 806
    807 
    +.ifdef X86
    606 808 
     .c.obj :
    809 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    607 810 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    608 811 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    609 812 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    610 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    611 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    813 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    814 
    +	$(MMS$TARGET_NAME)_64.c
    815 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    816 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    817 
    +.else
    818 
    +.c.obj :
    819 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    820 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    821 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    822 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    823 
    +	$(MMS$TARGET_NAME)_64.c
    612 824 
     	delete $(MMS$TARGET_NAME)_64.c;*
    825 
    +.endif
    613 826
    614 827 
     OBJS=gxvalid.obj
    615 828
    616 829 
     OBJS64=gxvalid_64.obj
    617 830
    831 
    +OBJSCXX=gxvalid_cxx.obj
    832 
    +
    618 833 
     all : $(OBJS)
    619 834 
             library [--.lib]freetype.olb $(OBJS)
    620 835 
             library [--.lib]freetype.olb $(OBJS64)
    836 
    +.ifdef X86
    837 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    838 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    839 
    +.endif
    621 840
    622 841 
     # EOF
    623 842 
     $ eod
    ... ... @@ -642,26 +861,48 @@ $ deck
    642 861 
     # fully.
    643 862 
     $EOD
    644 863 
     $ write out "COMP_FLAGS = ", ccopt
    864 
    +$ if x86_64 then write out "CXXFLAGS = ", cxxopt
    645 865 
     $ copy sys$input: out
    646 866 
     $ deck
    647 867
    648 868 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.gzip])
    869 
    +.ifdef X86
    870 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    871 
    +.endif
    649 872
    873 
    +.ifdef X86
    650 874 
     .c.obj :
    875 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    651 876 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    652 877 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    653 878 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    654 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    655 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    879 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    880 
    +	$(MMS$TARGET_NAME)_64.c
    881 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    882 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    883 
    +.else
    884 
    +.c.obj :
    885 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    886 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    887 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    888 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    889 
    +	$(MMS$TARGET_NAME)_64.c
    656 890 
     	delete $(MMS$TARGET_NAME)_64.c;*
    891 
    +.endif
    657 892
    658 893 
     OBJS=ftgzip.obj
    659 894
    660 895 
     OBJS64=ftgzip_64.obj
    661 896
    897 
    +OBJSCXX=ftgzip_cxx.obj
    898 
    +
    662 899 
     all : $(OBJS)
    663 900 
             library [--.lib]freetype.olb $(OBJS)
    664 901 
             library [--.lib]freetype.olb $(OBJS64)
    902 
    +.ifdef X86
    903 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    904 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    905 
    +.endif
    665 906
    666 907 
     # EOF
    667 908 
     $ eod
    ... ... @@ -688,26 +929,48 @@ $ deck
    688 929 
     # fully.
    689 930 
     $EOD
    690 931 
     $ write out "COMP_FLAGS = ", ccopt
    932 
    +$ if x86_64 then write out "CXXFLAGS = ", cxxopt
    691 933 
     $ copy sys$input: out
    692 934 
     $ deck
    693 935
    694 936 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.bzip2])
    937 
    +.ifdef X86
    938 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    939 
    +.endif
    695 940
    941 
    +.ifdef X86
    696 942 
     .c.obj :
    943 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    697 944 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    698 945 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    699 946 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    700 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    701 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    947 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    948 
    +	$(MMS$TARGET_NAME)_64.c
    949 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    702 950 
     	delete $(MMS$TARGET_NAME)_64.c;*
    951 
    +.else
    952 
    +.c.obj :
    953 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    954 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    955 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    956 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    957 
    +	$(MMS$TARGET_NAME)_64.c
    958 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    959 
    +.endif
    703 960
    704 961 
     OBJS=ftbzip2.obj
    705 962
    706 963 
     OBJS64=ftbzip2_64.obj
    707 964
    965 
    +OBJSCXX=ftbzip2_cxx.obj
    966 
    +
    708 967 
     all : $(OBJS)
    709 968 
             library [--.lib]freetype.olb $(OBJS)
    710 969 
             library [--.lib]freetype.olb $(OBJS64)
    970 
    +.ifdef X86
    971 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    972 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    973 
    +.endif
    711 974
    712 975 
     # EOF
    713 976 
     $ eod
    ... ... @@ -732,26 +995,48 @@ $ deck
    732 995 
     # fully.
    733 996 
     $EOD
    734 997 
     $ write out "COMP_FLAGS = ", ccopt
    998 
    +$ if x86_64 then write out "CXXFLAGS = ", cxxopt
    735 999 
     $ copy sys$input: out
    736 1000 
     $ deck
    737 1001
    738 1002 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.lzw])
    1003 
    +.ifdef X86
    1004 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1005 
    +.endif
    739 1006
    1007 
    +.ifdef X86
    740 1008 
     .c.obj :
    1009 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    741 1010 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    742 1011 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    743 1012 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    744 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    745 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    1013 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1014 
    +	$(MMS$TARGET_NAME)_64.c
    1015 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    1016 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1017 
    +.else
    1018 
    +.c.obj :
    1019 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1020 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1021 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1022 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1023 
    +	$(MMS$TARGET_NAME)_64.c
    746 1024 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1025 
    +.endif
    747 1026
    748 1027 
     OBJS=ftlzw.obj
    749 1028
    750 1029 
     OBJS64=ftlzw_64.obj
    751 1030
    1031 
    +OBJSCXX=ftlzw_cxx.obj
    1032 
    +
    752 1033 
     all : $(OBJS)
    753 1034 
             library [--.lib]freetype.olb $(OBJS)
    754 1035 
             library [--.lib]freetype.olb $(OBJS64)
    1036 
    +.ifdef X86
    1037 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1038 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1039 
    +.endif
    755 1040
    756 1041 
     # EOF
    757 1042 
     $ eod
    ... ... @@ -777,22 +1062,43 @@ $ deck
    777 1062
    778 1063
    779 1064 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.otvalid])
    1065 
    +.ifdef X86
    1066 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1067 
    +.endif
    780 1068
    1069 
    +.ifdef X86
    781 1070 
     .c.obj :
    1071 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    782 1072 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    783 1073 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    784 1074 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    785 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    786 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    1075 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1076 
    +	$(MMS$TARGET_NAME)_64.c
    1077 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    1078 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1079 
    +.else
    1080 
    +.c.obj :
    1081 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1082 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1083 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1084 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1085 
    +	$(MMS$TARGET_NAME)_64.c
    787 1086 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1087 
    +.endif
    788 1088
    789 1089 
     OBJS=otvalid.obj
    790 1090
    791 1091 
     OBJS64=otvalid_64.obj
    792 1092
    1093 
    +OBJSCXX=otvalid_cxx.obj
    1094 
    +
    793 1095 
     all : $(OBJS)
    794 1096 
             library [--.lib]freetype.olb $(OBJS)
    795 1097 
             library [--.lib]freetype.olb $(OBJS64)
    1098 
    +.ifdef X86
    1099 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1100 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1101 
    +.endif
    796 1102
    797 1103 
     # EOF
    798 1104 
     $ eod
    ... ... @@ -830,22 +1136,43 @@ $ deck
    830 1136
    831 1137
    832 1138 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.pcf])
    1139 
    +.ifdef X86
    1140 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1141 
    +.endif
    833 1142
    1143 
    +.ifdef X86
    834 1144 
     .c.obj :
    1145 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    835 1146 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    836 1147 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    837 1148 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    838 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    839 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    1149 
    +	cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1150 
    +	$(MMS$TARGET_NAME)_64.c
    1151 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    1152 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1153 
    +.else
    1154 
    +.c.obj :
    1155 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1156 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1157 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1158 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1159 
    +	$(MMS$TARGET_NAME)_64.c
    840 1160 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1161 
    +.endif
    841 1162
    842 1163 
     OBJS=pcf.obj
    843 1164
    844 1165 
     OBJS64=pcf_64.obj
    845 1166
    1167 
    +OBJSCXX=pcf_cxx.obj
    1168 
    +
    846 1169 
     all : $(OBJS)
    847 1170 
             library [--.lib]freetype.olb $(OBJS)
    848 1171 
             library [--.lib]freetype.olb $(OBJS64)
    1172 
    +.ifdef X86
    1173 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1174 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1175 
    +.endif
    849 1176
    850 1177 
     # EOF
    851 1178 
     $ eod
    ... ... @@ -871,22 +1198,43 @@ $ deck
    871 1198
    872 1199
    873 1200 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.pfr])
    1201 
    +.ifdef X86
    1202 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1203 
    +.endif
    874 1204
    1205 
    +.ifdef X86
    875 1206 
     .c.obj :
    1207 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    876 1208 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    877 1209 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    878 1210 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    879 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    880 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    1211 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1212 
    +	$(MMS$TARGET_NAME)_64.c
    1213 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    881 1214 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1215 
    +.else
    1216 
    +.c.obj :
    1217 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1218 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1219 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1220 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1221 
    +	$(MMS$TARGET_NAME)_64.c
    1222 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1223 
    +.endif
    882 1224
    883 1225 
     OBJS=pfr.obj
    884 1226
    885 1227 
     OBJS64=pfr_64.obj
    886 1228
    1229 
    +OBJSCXX=pfr_cxx.obj
    1230 
    +
    887 1231 
     all : $(OBJS)
    888 1232 
             library [--.lib]freetype.olb $(OBJS)
    889 1233 
             library [--.lib]freetype.olb $(OBJS64)
    1234 
    +.ifdef X86
    1235 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1236 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1237 
    +.endif
    890 1238
    891 1239 
     # EOF
    892 1240 
     $ eod
    ... ... @@ -912,22 +1260,43 @@ $ deck
    912 1260
    913 1261
    914 1262 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.psaux])
    1263 
    +.ifdef X86
    1264 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1265 
    +.endif
    915 1266
    1267 
    +.ifdef X86
    916 1268 
     .c.obj :
    1269 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    917 1270 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    918 1271 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    919 1272 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    920 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    921 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    1273 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1274 
    +	$(MMS$TARGET_NAME)_64.c
    1275 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    922 1276 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1277 
    +.else
    1278 
    +.c.obj :
    1279 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1280 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1281 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1282 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1283 
    +	$(MMS$TARGET_NAME)_64.c
    1284 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1285 
    +.endif
    923 1286
    924 1287 
     OBJS=psaux.obj
    925 1288
    926 1289 
     OBJS64=psaux_64.obj
    927 1290
    1291 
    +OBJSCXX=psaux_cxx.obj
    1292 
    +
    928 1293 
     all : $(OBJS)
    929 1294 
             library [--.lib]freetype.olb $(OBJS)
    930 1295 
             library [--.lib]freetype.olb $(OBJS64)
    1296 
    +.ifdef X86
    1297 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1298 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1299 
    +.endif
    931 1300
    932 1301 
     # EOF
    933 1302 
     $ eod
    ... ... @@ -953,22 +1322,43 @@ $ deck
    953 1322
    954 1323
    955 1324 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.psnames])
    1325 
    +.ifdef X86
    1326 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1327 
    +.endif
    956 1328
    1329 
    +.ifdef X86
    957 1330 
     .c.obj :
    1331 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    958 1332 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    959 1333 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    960 1334 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    961 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    962 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    1335 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1336 
    +	$(MMS$TARGET_NAME)_64.c
    1337 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    1338 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1339 
    +.else
    1340 
    +.c.obj :
    1341 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1342 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1343 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1344 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1345 
    +	$(MMS$TARGET_NAME)_64.c
    963 1346 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1347 
    +.endif
    964 1348
    965 1349 
     OBJS=pshinter.obj
    966 1350
    967 1351 
     OBJS64=pshinter_64.obj
    968 1352
    1353 
    +OBJSCXX=pshinter_cxx.obj
    1354 
    +
    969 1355 
     all : $(OBJS)
    970 1356 
             library [--.lib]freetype.olb $(OBJS)
    971 1357 
             library [--.lib]freetype.olb $(OBJS64)
    1358 
    +.ifdef X86
    1359 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1360 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1361 
    +.endif
    972 1362
    973 1363 
     # EOF
    974 1364 
     $ eod
    ... ... @@ -994,22 +1384,43 @@ $ deck
    994 1384
    995 1385
    996 1386 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.psnames])
    1387 
    +.ifdef X86
    1388 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1389 
    +.endif
    997 1390
    1391 
    +.ifdef X86
    998 1392 
     .c.obj :
    1393 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    999 1394 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1000 1395 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1001 1396 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1002 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    1003 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    1397 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1398 
    +	$(MMS$TARGET_NAME)_64.c
    1399 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    1400 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1401 
    +.else
    1402 
    +.c.obj :
    1403 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1404 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1405 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1406 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1407 
    +	$(MMS$TARGET_NAME)_64.c
    1004 1408 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1409 
    +.endif
    1005 1410
    1006 1411 
     OBJS=psnames.obj
    1007 1412
    1008 1413 
     OBJS64=psnames_64.obj
    1009 1414
    1415 
    +OBJSCXX=psnames_cxx.obj
    1416 
    +
    1010 1417 
     all : $(OBJS)
    1011 1418 
             library [--.lib]freetype.olb $(OBJS)
    1012 1419 
             library [--.lib]freetype.olb $(OBJS64)
    1420 
    +.ifdef X86
    1421 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1422 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1423 
    +.endif
    1013 1424
    1014 1425 
     # EOF
    1015 1426 
     $ eod
    ... ... @@ -1035,22 +1446,43 @@ $ deck
    1035 1446
    1036 1447
    1037 1448 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.raster])
    1449 
    +.ifdef X86
    1450 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1451 
    +.endif
    1038 1452
    1453 
    +.ifdef X86
    1039 1454 
     .c.obj :
    1455 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    1040 1456 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1041 1457 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1042 1458 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1043 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    1044 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    1459 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1460 
    +	$(MMS$TARGET_NAME)_64.c
    1461 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    1462 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1463 
    +.else
    1464 
    +.c.obj :
    1465 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1466 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1467 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1468 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1469 
    +	$(MMS$TARGET_NAME)_64.c
    1045 1470 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1471 
    +.endif
    1046 1472
    1047 1473 
     OBJS=raster.obj
    1048 1474
    1049 1475 
     OBJS64=raster_64.obj
    1050 1476
    1477 
    +OBJSCXX=raster_cxx.obj
    1478 
    +
    1051 1479 
     all : $(OBJS)
    1052 1480 
             library [--.lib]freetype.olb $(OBJS)
    1053 1481 
             library [--.lib]freetype.olb $(OBJS64)
    1482 
    +.ifdef X86
    1483 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1484 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1485 
    +.endif
    1054 1486
    1055 1487 
     # EOF
    1056 1488 
     $ eod
    ... ... @@ -1076,22 +1508,43 @@ $ deck
    1076 1508
    1077 1509
    1078 1510 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.sfnt])
    1511 
    +.ifdef X86
    1512 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1513 
    +.endif
    1079 1514
    1515 
    +.ifdef X86
    1080 1516 
     .c.obj :
    1517 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    1081 1518 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1082 1519 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1083 1520 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1084 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    1085 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    1521 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1522 
    +	$(MMS$TARGET_NAME)_64.c
    1523 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    1524 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1525 
    +.else
    1526 
    +.c.obj :
    1527 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1528 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1529 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1530 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1531 
    +	$(MMS$TARGET_NAME)_64.c
    1086 1532 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1533 
    +.endif
    1087 1534
    1088 1535 
     OBJS=sfnt.obj
    1089 1536
    1090 1537 
     OBJS64=sfnt_64.obj
    1091 1538
    1539 
    +OBJSCXX=sfnt_cxx.obj
    1540 
    +
    1092 1541 
     all : $(OBJS)
    1093 1542 
             library [--.lib]freetype.olb $(OBJS)
    1094 1543 
             library [--.lib]freetype.olb $(OBJS64)
    1544 
    +.ifdef X86
    1545 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1546 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1547 
    +.endif
    1095 1548
    1096 1549 
     # EOF
    1097 1550 
     $ eod
    ... ... @@ -1117,22 +1570,43 @@ $ deck
    1117 1570
    1118 1571
    1119 1572 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.smooth])
    1573 
    +.ifdef X86
    1574 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1575 
    +.endif
    1120 1576
    1577 
    +.ifdef X86
    1578 
    +.c.obj :
    1579 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    1580 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1581 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1582 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1583 
    +	cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1584 
    +	$(MMS$TARGET_NAME)_64.c
    1585 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    1586 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1587 
    +.else
    1121 1588 
     .c.obj :
    1122 1589 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1123 1590 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1124 1591 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1125 
    -	cc$(CFLAGS)/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1592 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1126 1593 
     	$(MMS$TARGET_NAME)_64.c
    1127 1594 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1595 
    +.endif
    1128 1596
    1129 1597 
     OBJS=smooth.obj
    1130 1598
    1131 1599 
     OBJS64=smooth_64.obj
    1132 1600
    1601 
    +OBJSCXX=smooth_cxx.obj
    1602 
    +
    1133 1603 
     all : $(OBJS)
    1134 1604 
             library [--.lib]freetype.olb $(OBJS)
    1135 1605 
             library [--.lib]freetype.olb $(OBJS64)
    1606 
    +.ifdef X86
    1607 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1608 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1609 
    +.endif
    1136 1610
    1137 1611 
     # EOF
    1138 1612 
     $ eod
    ... ... @@ -1158,22 +1632,43 @@ $ deck
    1158 1632
    1159 1633
    1160 1634 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.svg])
    1635 
    +.ifdef X86
    1636 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1637 
    +.endif
    1161 1638
    1639 
    +.ifdef X86
    1162 1640 
     .c.obj :
    1641 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    1163 1642 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1164 1643 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1165 1644 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1166 
    -	cc$(CFLAGS)/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1645 
    +	cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1167 1646 
     	$(MMS$TARGET_NAME)_64.c
    1647 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    1168 1648 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1649 
    +.else
    1650 
    +.c.obj :
    1651 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1652 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1653 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1654 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1655 
    +	$(MMS$TARGET_NAME)_64.c
    1656 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1657 
    +.endif
    1169 1658
    1170 1659 
     OBJS=svg.obj
    1171 1660
    1172 1661 
     OBJS64=svg_64.obj
    1173 1662
    1663 
    +OBJSCXX=svg_cxx.obj
    1664 
    +
    1174 1665 
     all : $(OBJS)
    1175 1666 
             library [--.lib]freetype.olb $(OBJS)
    1176 1667 
             library [--.lib]freetype.olb $(OBJS64)
    1668 
    +.ifdef X86
    1669 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1670 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1671 
    +.endif
    1177 1672
    1178 1673 
     # EOF
    1179 1674 
     $ eod
    ... ... @@ -1199,22 +1694,43 @@ $ deck
    1199 1694
    1200 1695
    1201 1696 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.truetype])
    1697 
    +.ifdef X86
    1698 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1699 
    +.endif
    1202 1700
    1701 
    +.ifdef X86
    1203 1702 
     .c.obj :
    1703 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    1204 1704 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1205 1705 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1206 1706 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1207 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    1208 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    1707 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1708 
    +	$(MMS$TARGET_NAME)_64.c
    1709 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    1209 1710 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1711 
    +.else
    1712 
    +.c.obj :
    1713 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1714 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1715 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1716 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1717 
    +	$(MMS$TARGET_NAME)_64.c
    1718 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1719 
    +.endif
    1210 1720
    1211 1721 
     OBJS=truetype.obj
    1212 1722
    1213 1723 
     OBJS64=truetype_64.obj
    1214 1724
    1725 
    +OBJSCXX=truetype_cxx.obj
    1726 
    +
    1215 1727 
     all : $(OBJS)
    1216 1728 
             library [--.lib]freetype.olb $(OBJS)
    1217 1729 
             library [--.lib]freetype.olb $(OBJS64)
    1730 
    +.ifdef X86
    1731 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1732 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1733 
    +.endif
    1218 1734
    1219 1735 
     # EOF
    1220 1736 
     $ eod
    ... ... @@ -1240,22 +1756,43 @@ $ deck
    1240 1756
    1241 1757
    1242 1758 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.type1])
    1759 
    +.ifdef X86
    1760 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1761 
    +.endif
    1243 1762
    1763 
    +.ifdef X86
    1244 1764 
     .c.obj :
    1765 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    1245 1766 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1246 1767 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1247 1768 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1248 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    1249 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    1769 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1770 
    +	$(MMS$TARGET_NAME)_64.c
    1771 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    1772 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1773 
    +.else
    1774 
    +.c.obj :
    1775 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1776 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1777 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1778 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1779 
    +	$(MMS$TARGET_NAME)_64.c
    1250 1780 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1781 
    +.endif
    1251 1782
    1252 1783 
     OBJS=type1.obj
    1253 1784
    1254 1785 
     OBJS64=type1_64.obj
    1255 1786
    1787 
    +OBJSCXX=type1_cxx.obj
    1788 
    +
    1256 1789 
     all : $(OBJS)
    1257 1790 
             library [--.lib]freetype.olb $(OBJS)
    1258 1791 
             library [--.lib]freetype.olb $(OBJS64)
    1792 
    +.ifdef X86
    1793 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1794 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1795 
    +.endif
    1259 1796
    1260 1797 
     type1.obj : type1.c t1parse.c t1load.c t1objs.c t1driver.c t1gload.c t1afm.c
    1261 1798
    ... ... @@ -1283,22 +1820,43 @@ $ deck
    1283 1820
    1284 1821
    1285 1822 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.type1])
    1823 
    +.ifdef X86
    1824 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1825 
    +.endif
    1286 1826
    1827 
    +.ifdef X86
    1287 1828 
     .c.obj :
    1829 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    1288 1830 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1289 1831 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1290 1832 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1291 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    1292 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    1833 
    +	cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1834 
    +	$(MMS$TARGET_NAME)_64.c
    1835 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    1836 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1837 
    +.else
    1838 
    +.c.obj :
    1839 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1840 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1841 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1842 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1843 
    +	$(MMS$TARGET_NAME)_64.c
    1293 1844 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1845 
    +.endif
    1294 1846
    1295 1847 
     OBJS=sdf.obj
    1296 1848
    1297 1849 
     OBJS64=sdf_64.obj
    1298 1850
    1851 
    +OBJSCXX=sdf_cxx.obj
    1852 
    +
    1299 1853 
     all : $(OBJS)
    1300 1854 
             library [--.lib]freetype.olb $(OBJS)
    1301 1855 
             library [--.lib]freetype.olb $(OBJS64)
    1856 
    +.ifdef X86
    1857 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1858 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1859 
    +.endif
    1302 1860
    1303 1861 
     sdf.obj : sdf.c ftbsdf.c ftsdf.c ftsdfcommon.c ftsdfrend.c
    1304 1862
    ... ... @@ -1326,22 +1884,43 @@ $ deck
    1326 1884
    1327 1885
    1328 1886 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.type42])
    1887 
    +.ifdef X86
    1888 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1889 
    +.endif
    1329 1890
    1891 
    +.ifdef X86
    1330 1892 
     .c.obj :
    1893 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    1331 1894 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1332 1895 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1333 1896 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1334 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    1335 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    1897 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1898 
    +	$(MMS$TARGET_NAME)_64.c
    1899 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    1900 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1901 
    +.else
    1902 
    +.c.obj :
    1903 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1904 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1905 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1906 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1907 
    +	$(MMS$TARGET_NAME)_64.c
    1336 1908 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1909 
    +.endif
    1337 1910
    1338 1911 
     OBJS=type42.obj
    1339 1912
    1340 1913 
     OBJS64=type42_64.obj
    1341 1914
    1915 
    +OBJSCXX=type42_cxx.obj
    1916 
    +
    1342 1917 
     all : $(OBJS)
    1343 1918 
             library [--.lib]freetype.olb $(OBJS)
    1344 1919 
             library [--.lib]freetype.olb $(OBJS64)
    1920 
    +.ifdef X86
    1921 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1922 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1923 
    +.endif
    1345 1924
    1346 1925 
     # EOF
    1347 1926 
     $ eod
    ... ... @@ -1367,22 +1946,43 @@ $ deck
    1367 1946
    1368 1947
    1369 1948 
     CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.winfonts])
    1949 
    +.ifdef X86
    1950 
    +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base])
    1951 
    +.endif
    1370 1952
    1953 
    +.ifdef X86
    1371 1954 
     .c.obj :
    1955 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c
    1372 1956 
     	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1373 1957 
     	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1374 1958 
     	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1375 
    -	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\
    1376 
    -	/obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c
    1959 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1960 
    +	$(MMS$TARGET_NAME)_64.c
    1961 
    +	cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c
    1962 
    +	delete $(MMS$TARGET_NAME)_64.c;*
    1963 
    +.else
    1964 
    +.c.obj :
    1965 
    +	cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c
    1966 
    +	pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl:
    1967 
    +	mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map
    1968 
    +	cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\
    1969 
    +	$(MMS$TARGET_NAME)_64.c
    1377 1970 
     	delete $(MMS$TARGET_NAME)_64.c;*
    1971 
    +.endif
    1378 1972
    1379 1973 
     OBJS=winfnt.obj
    1380 1974
    1381 1975 
     OBJS64=winfnt_64.obj
    1382 1976
    1977 
    +OBJSCXX=winfnt_cxx.obj
    1978 
    +
    1383 1979 
     all : $(OBJS)
    1384 1980 
             library [--.lib]freetype.olb $(OBJS)
    1385 1981 
             library [--.lib]freetype.olb $(OBJS64)
    1982 
    +.ifdef X86
    1983 
    +        library [--.lib]freetype_cxx.olb $(OBJSCXX)
    1984 
    +        library [--.lib]freetype_cxx.olb $(OBJS64)
    1985 
    +.endif
    1386 1986
    1387 1987 
     # EOF
    1388 1988 
     $ eod
    ... ... @@ -1401,6 +2001,7 @@ $ cparm = f$edit(p'i',"upcase")
    1401 2001 
     $   if cparm .eqs. "DEBUG"
    1402 2002 
     $   then
    1403 2003 
     $     ccopt = ccopt + "/noopt/deb"
    2004 
    +$     if x86_64 then cxxopt = cxxopt + "/noopt/deb"
    1404 2005 
     $     lopts = lopts + "/deb"
    1405 2006 
     $   endif
    1406 2007 
     $   if f$locate("CCOPT=",cparm) .lt. f$length(cparm)
    ... ... @@ -1408,6 +2009,7 @@ $ then
    1408 2009 
     $     start = f$locate("=",cparm) + 1
    1409 2010 
     $     len   = f$length(cparm) - start
    1410 2011 
     $     ccopt = ccopt + f$extract(start,len,cparm)
    2012 
    +$     if x86_64 then cxxopt = cxxopt + f$extract(start,len,cparm)
    1411 2013 
     $   endif
    1412 2014 
     $   if cparm .eqs. "LINK" then linkonly = true
    1413 2015 
     $   if f$locate("LOPTS=",cparm) .lt. f$length(cparm)

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.freedesktop.org. Manage all notifications · Help

    reply via email to
    [Prev in Thread] Current Thread [Next in Thread]