From 9e3c5d7e183c1a8d5ed8868d7d28ef18d3ec9ec8 Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Fri, 21 Jul 2023 21:36:57 +0200 Subject: [PATCH] * 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. --- vms_make.com | 706 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 654 insertions(+), 52 deletions(-) diff --git a/vms_make.com b/vms_make.com index 52a607599..2c85a016a 100644 --- a/vms_make.com +++ b/vms_make.com @@ -34,6 +34,13 @@ $! 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 +$! +$! Get platform +$ vax = f$getsyi("ARCH_NAME").eqs. "VAX" +$ axp = f$getsyi("ARCH_NAME").eqs. "Alpha" +$ ia64 = f$getsyi("ARCH_NAME").eqs. "IA64" +$ x86_64 = f$getsyi("ARCH_NAME").eqs. "x86_64" +$! $ true = 1 $ false = 0 $ tmpnam = "temp_" + f$getjpi("","pid") @@ -48,6 +55,7 @@ $! Setup variables holding "config" information $! $ Make = "" $ ccopt = "/name=(as_is,short)/float=ieee" +$ if ( x86_64 ) then cxxopt = "/name=(as_is,short)" $ lopts = "" $ dnsrl = "" $ aconf_in_file = "config.hin" @@ -86,34 +94,45 @@ $ if ( have_png ) then write libsf "sys$library:libpng.olb/lib" $ if ( have_bz2 ) then write libsf "sys$library:libbz2.olb/lib" $ if ( have_z ) then write libsf "sys$library:libz.olb/lib" $ close libsf +$ open/write libsf libs_cxx.opt +$ if ( have_harfbuzz ) then write libsf "sys$library:libharfbuzz.olb/lib" +$ if ( have_png ) then write libsf "sys$library:libpng_cxx.olb/lib" +$ if ( have_bz2 ) then write libsf "sys$library:libbz2_cxx.olb/lib" +$ if ( have_z ) then write libsf "sys$library:libz_cxx.olb/lib" +$ close libsf $! $! Create objects $! $ libdefs = "FT2_BUILD_LIBRARY,FT_CONFIG_OPTION_OLD_INTERNALS" -$ if ( have_bz2 ) then libdef=libdefs+",FT_CONFIG_OPTION_USE_BZIP2=1" -$ if ( have_png ) then libdef=libdefs+",FT_CONFIG_OPTION_USE_PNG=1" -$ if ( have_z ) then libdef=libdefs+",FT_CONFIG_OPTION_USE_ZLIB=1" -$ if ( have_harfbuzz ) then libdef=libdefs+",FT_CONFIG_OPTION_USE_HARFBUZZ=1" +$ if ( have_bz2 ) then libdefs=libdefs+",FT_CONFIG_OPTION_USE_BZIP2=1" +$ if ( have_png ) then libdefs=libdefs+",FT_CONFIG_OPTION_USE_PNG=1" +$ if ( have_z ) then libdefs=libdefs+",FT_CONFIG_OPTION_SYSTEM_ZLIB=1" +$ if ( have_harfbuzz ) then libdefs=libdefs+",FT_CONFIG_OPTION_USE_HARFBUZZ=1" $ if libdefs .nes. "" $ then -$ ccopt = ccopt + "/define=(" + f$extract(0,f$length(libdefs)-1,libdefs) + ")" +$ ccopt = ccopt + "/define=(" + libdefs + ")" +$ if ( x86_64 ) then cxxopt = cxxopt + "/define=(" + libdefs + ")" $ endif $! $ if f$locate("AS_IS",f$edit(ccopt,"UPCASE")) .lt. f$length(ccopt) - then s_case = true $ gosub crea_mms $! -$ 'Make' /macro=(comp_flags="''ccopt'") +$ if x86_64 +$ then +$ 'Make' /macro=(comp_flags="''ccopt'",cxxcomp_flags="''cxxopt'","X86=1") +$ else +$ 'Make' /macro=(comp_flags="''ccopt'") +$ endif $ purge/nolog [...]descrip.mms $! $! $! Alpha & Itanium get a shareable image $! -$ If f$getsyi("HW_MODEL") .gt. 1024 .or. f$getsyi("HW_MODEL") .eq. 0 +$ If .not. vax $ Then $ write sys$output "Creating freetype2shr.exe" $ library/extract=* [.lib]freetype.olb -$ pipe link/nodeb/noshare/noexe/map=libfreetype.map/full freetype.obj | copy sys$input nl: $ set def [.src.tools] $ cc apinames.c $ link apinames @@ -134,6 +153,22 @@ $ link/nodeb/share=[.lib]freetype2shr.exe/map=libfreetype.map/full - libfreetype/opt,freetype_vms/opt,libs/opt $ delete freetype.obj;* $ endif +$ if x86_64 +$ then +$ write sys$output "Creating freetype2shr_cxx.exe" +$ library/extract=* [.lib]freetype_cxx.olb +$ open/write file libfreetype_cxx.opt +$ write file "!" +$ write file "! libfreetype_cxx.opt generated by vms_make.com" +$ write file "!" +$ write file "IDENTIFICATION=""freetype2 2.0""" +$ write file "GSMATCH=LEQUAL,2,0 +$ write file "freetype_cxx.obj" +$ close file +$ link/nodeb/share=[.lib]freetype2shr_cxx.exe/map=libfreetype_cxx.map/full - + libfreetype_cxx/opt,freetype_vms/opt,libs_cxx/opt +$ delete freetype_cxx.obj;* +$ endif $! $ exit $! @@ -175,6 +210,7 @@ $ deck # fully. $ EOD $ write out "CFLAGS = ", ccopt +$ if x86_64 then write out "CXXFLAGS = ", cxxopt $ copy sys$input: out $ deck @@ -276,7 +312,21 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: @@ -284,14 +334,21 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=ftsystem.obj OBJS64=ftsystem_64.obj +OBJSCXX=ftsystem_cxx.obj + all : $(OBJS) library/create [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library/create [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif ftsystem.obj : ftsystem.c ftconfig.h @@ -318,22 +375,43 @@ $ deck # fully. CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.autofit]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map nl: exclude hb_ + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ + /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=autofit.obj OBJS64=autofit_64.obj +OBJSCXX=autofit_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -359,14 +437,29 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include],[--.src.base]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 .c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.else +.c.obj : + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=ftbase.obj,\ ftbbox.obj,\ @@ -402,9 +495,30 @@ OBJS64=ftbase_64.obj,\ fttype1_64.obj,\ ftwinfnt_64.obj,ftpatent_64.obj,ftgxval_64.obj,ftotval_64.obj +OBJSCXX=ftbase_cxx.obj,\ + ftbbox_cxx.obj,\ + ftbdf_cxx.obj,\ + ftbitmap_cxx.obj,\ + ftcid_cxx.obj,\ + ftdebug_cxx.obj,\ + ftfstype_cxx.obj,\ + ftgasp_cxx.obj,\ + ftglyph_cxx.obj,\ + ftinit_cxx.obj,\ + ftmm_cxx.obj,\ + ftpfr_cxx.obj,\ + ftstroke_cxx.obj,\ + ftsynth_cxx.obj,\ + fttype1_cxx.obj,\ + ftwinfnt_cxx.obj,ftpatent_cxx.obj,ftgxval_cxx.obj,ftotval_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif ftbase.obj : ftbase.c ftadvanc.c ftcalc.c ftcolor.c ftdbgmem.c fterrors.c\ ftfntfmt.c ftgloadr.c fthash.c ftlcdfil.c ftmac.c ftobjs.c ftoutln.c\ @@ -435,22 +549,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.bdf]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=bdf.obj OBJS64=bdf_64.obj +OBJSCXX=bdf_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -476,22 +611,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cache])/nowarn +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=ftcache.obj OBJS64=ftcache_64.obj +OBJSCXX=ftcache_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif ftcache.obj : ftcache.c ftcbasic.c ftccache.c ftccmap.c ftcglyph.c ftcimage.c \ ftcmanag.c ftcmru.c ftcsbits.c @@ -520,22 +676,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cff]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=cff.obj OBJS64=cff_64.obj +OBJSCXX=cff_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -561,22 +738,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.cid]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=type1cid.obj OBJS64=type1cid_64.obj +OBJSCXX=type1cid_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -602,22 +800,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.gxvalid]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=gxvalid.obj OBJS64=gxvalid_64.obj +OBJSCXX=gxvalid_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -642,26 +861,48 @@ $ deck # fully. $EOD $ write out "COMP_FLAGS = ", ccopt +$ if x86_64 then write out "CXXFLAGS = ", cxxopt $ copy sys$input: out $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.gzip]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=ftgzip.obj OBJS64=ftgzip_64.obj +OBJSCXX=ftgzip_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -688,26 +929,48 @@ $ deck # fully. $EOD $ write out "COMP_FLAGS = ", ccopt +$ if x86_64 then write out "CXXFLAGS = ", cxxopt $ copy sys$input: out $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.bzip2]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=ftbzip2.obj OBJS64=ftbzip2_64.obj +OBJSCXX=ftbzip2_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -732,26 +995,48 @@ $ deck # fully. $EOD $ write out "COMP_FLAGS = ", ccopt +$ if x86_64 then write out "CXXFLAGS = ", cxxopt $ copy sys$input: out $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.lzw]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=ftlzw.obj OBJS64=ftlzw_64.obj +OBJSCXX=ftlzw_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -777,22 +1062,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.otvalid]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=otvalid.obj OBJS64=otvalid_64.obj +OBJSCXX=otvalid_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -830,22 +1136,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.pcf]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=pcf.obj OBJS64=pcf_64.obj +OBJSCXX=pcf_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -871,22 +1198,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.pfr]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=pfr.obj OBJS64=pfr_64.obj +OBJSCXX=pfr_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -912,22 +1260,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.psaux]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=psaux.obj OBJS64=psaux_64.obj +OBJSCXX=psaux_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -953,22 +1322,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.psnames]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=pshinter.obj OBJS64=pshinter_64.obj +OBJSCXX=pshinter_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -994,22 +1384,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.psnames]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=psnames.obj OBJS64=psnames_64.obj +OBJSCXX=psnames_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -1035,22 +1446,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.raster]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=raster.obj OBJS64=raster_64.obj +OBJSCXX=raster_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -1076,22 +1508,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.sfnt]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=sfnt.obj OBJS64=sfnt_64.obj +OBJSCXX=sfnt_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -1117,22 +1570,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.smooth]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=smooth.obj OBJS64=smooth_64.obj +OBJSCXX=smooth_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -1158,22 +1632,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.svg]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=svg.obj OBJS64=svg_64.obj +OBJSCXX=svg_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -1199,22 +1694,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.truetype]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=truetype.obj OBJS64=truetype_64.obj +OBJSCXX=truetype_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -1240,22 +1756,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.type1]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=type1.obj OBJS64=type1_64.obj +OBJSCXX=type1_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif type1.obj : type1.c t1parse.c t1load.c t1objs.c t1driver.c t1gload.c t1afm.c @@ -1283,22 +1820,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.type1]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=noinfo/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=sdf.obj OBJS64=sdf_64.obj +OBJSCXX=sdf_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif sdf.obj : sdf.c ftbsdf.c ftsdf.c ftsdfcommon.c ftsdfrend.c @@ -1326,22 +1884,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.type42]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=type42.obj OBJS64=type42_64.obj +OBJSCXX=type42_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -1367,22 +1946,43 @@ $ deck CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.include],[--.src.winfonts]) +.ifdef X86 +CXXFLAGS=$(CXXCOMP_FLAGS)$(DEBUG)/list/show=all/include=([],[--.include],[--.src.base]) +.endif +.ifdef X86 +.c.obj : + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_cxx.obj $(MMS$TARGET_NAME).c + cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c + pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: + mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c + cxx$(CXXFLAGS)/warn=noinfo/obj=$(MMS$TARGET_NAME)_64_cxx.obj $(MMS$TARGET_NAME)_64.c + delete $(MMS$TARGET_NAME)_64.c;* +.else .c.obj : cc$(CFLAGS)/warn=noinfo/point=32/list/show=all $(MMS$TARGET_NAME).c pipe link/map/full/exec=nl: $(MMS$TARGET_NAME).obj | copy sys$input nl: mc sys$library:vms_auto64 $(MMS$TARGET_NAME).map - cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64\ - /obj=$(MMS$TARGET_NAME)_64.obj $(MMS$TARGET_NAME)_64.c + cc$(CFLAGS)/warn=(noinfo,disable=(MAYLOSEDATA3))/point=64/obj=$(MMS$TARGET_NAME)_64.obj\ + $(MMS$TARGET_NAME)_64.c delete $(MMS$TARGET_NAME)_64.c;* +.endif OBJS=winfnt.obj OBJS64=winfnt_64.obj +OBJSCXX=winfnt_cxx.obj + all : $(OBJS) library [--.lib]freetype.olb $(OBJS) library [--.lib]freetype.olb $(OBJS64) +.ifdef X86 + library [--.lib]freetype_cxx.olb $(OBJSCXX) + library [--.lib]freetype_cxx.olb $(OBJS64) +.endif # EOF $ eod @@ -1401,6 +2001,7 @@ $ cparm = f$edit(p'i',"upcase") $ if cparm .eqs. "DEBUG" $ then $ ccopt = ccopt + "/noopt/deb" +$ if x86_64 then cxxopt = cxxopt + "/noopt/deb" $ lopts = lopts + "/deb" $ endif $ if f$locate("CCOPT=",cparm) .lt. f$length(cparm) @@ -1408,6 +2009,7 @@ $ then $ start = f$locate("=",cparm) + 1 $ len = f$length(cparm) - start $ ccopt = ccopt + f$extract(start,len,cparm) +$ if x86_64 then cxxopt = cxxopt + f$extract(start,len,cparm) $ endif $ if cparm .eqs. "LINK" then linkonly = true $ if f$locate("LOPTS=",cparm) .lt. f$length(cparm)