BASE_common => {
template => 1,
defines =>
- [ sub {
- unless ($disabled{zlib}) {
- if (defined($disabled{"zlib-dynamic"})) {
- return "ZLIB";
- } else {
- return "ZLIB_SHARED";
- }
- }
- return (); }
- ],
+ sub {
+ my @defs = ();
+ push @defs, "ZLIB" unless $disabled{zlib};
+ push @defs, "ZLIB_SHARED" unless $disabled{"zlib-dynamic"};
+ return [ @defs ];
+ },
},
BASE_unix => {
sub {
unless ($disabled{zlib}) {
if (defined($disabled{"zlib-dynamic"})) {
- return "zlib1.lib";
+ return $withargs{zlib_lib} || "zlib1.lib";
}
}
return (); },
inherit_from => [ "BASE_common" ],
template => 1,
- ex_libs =>
- sub {
- unless ($disabled{zlib}) {
- if (defined($disabled{"zlib-dynamic"})) {
- if (defined($withargs{zlib_lib})) {
- return $withargs{zlib_lib}.'GNV$LIBZSHR.EXE/SHARED'
- } else {
- return 'GNV$LIBZSHR/SHARE';
- }
- }
- }
- return (); },
-
build_file => "descrip.mms",
build_scheme => [ "unified", "VMS" ],
},
if ($? == 0) {
push @{$vms_info->{disable_warns_p64}}, "MAYLOSEDATA3";
}
+
+ unless ($disabled{zlib}) {
+ if (defined($disabled{"zlib-dynamic"})) {
+ $vms_info->{zlib} = $withargs{zlib_lib} || 'GNV$LIBZSHR/SHARE';
+ $vms_info->{zlib_p32} = $withargs{zlib_lib} || 'GNV$LIBZSHR32/SHARE';
+ $vms_info->{zlib_p64} = $withargs{zlib_lib} || 'GNV$LIBZSHR64/SHARE';
+ } else {
+ $vms_info->{def_zlib} = $withargs{zlib_lib} || 'GNV$LIBZSHR';
+ $vms_info->{def_zlib_p32} = $withargs{zlib_lib} || 'GNV$LIBZSHR32';
+ $vms_info->{def_zlib_p64} = $withargs{zlib_lib} || 'GNV$LIBZSHR64';
+ }
+ }
}
return $vms_info;
}
@{vms_info()->{disable_warns}};
@warnings
? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); }),
+ defines =>
+ add(sub {
+ return vms_info()->{def_zlib}
+ ? "LIBZ=\"\"\"".vms_info()->{def_zlib}."\"\"\"" : ();
+ }),
+ ex_libs => add(sub { return vms_info()->{zlib} || (); }),
#as => "???",
#debug_aflags => "/NOOPTIMIZE/DEBUG",
#release_aflags => "/OPTIMIZE/NODEBUG",
@warnings
? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : ();
} ),
- ex_libs => sub { join(",", map { s|SHR([\./])|SHR32$1|g; $_ } @_) },
+ defines =>
+ add(sub {
+ return vms_info()->{def_zlib_p32}
+ ? "LIBZ=\"\"\"".vms_info()->{def_zlib_p32}."\"\"\"" : ();
+ }),
+ ex_libs => add(sub { return vms_info()->{zlib_p32} || (); }),
},
"vms-alpha-p64" => {
inherit_from => [ "vms-alpha" ],
@warnings
? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : ();
} ),
- ex_libs => sub { join(",", map { s|SHR([\./])|SHR64$1|g; $_ } @_) },
+ defines =>
+ add(sub {
+ return vms_info()->{def_zlib_p64}
+ ? "LIBZ=\"\"\"".vms_info()->{def_zlib_p64}."\"\"\"" : ();
+ }),
+ ex_libs => add(sub { return vms_info()->{zlib_p64} || (); }),
},
"vms-ia64" => {
inherit_from => [ "vms-generic" ],
@{vms_info()->{disable_warns}};
@warnings
? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : (); }),
+ defines =>
+ add(sub {
+ return vms_info()->{def_zlib}
+ ? "LIBZ=\"\"\"".vms_info()->{def_zlib}."\"\"\"" : ();
+ }),
+ ex_libs => add(sub { return vms_info()->{zlib} || (); }),
#as => "I4S",
#debug_aflags => "/NOOPTIMIZE/DEBUG",
#release_aflags => "/OPTIMIZE/NODEBUG",
@warnings
? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : ();
} ),
- ex_libs => sub { join(",", map { s|SHR([\./])|SHR32$1|g; $_ } @_) },
+ defines =>
+ add(sub {
+ return vms_info()->{def_zlib_p32}
+ ? "LIBZ=\"\"\"".vms_info()->{def_zlib_p32}."\"\"\"" : ();
+ }),
+ ex_libs => add(sub { return vms_info()->{zlib_p32} || (); }),
},
"vms-ia64-p64" => {
inherit_from => [ "vms-ia64" ],
@warnings
? "/WARNINGS=DISABLE=(".join(",",@warnings).")" : ();
} ),
- ex_libs => sub { join(",", map { s|SHR([\./])|SHR64$1|g; $_ } @_) },
+ defines =>
+ add(sub {
+ return vms_info()->{def_zlib_p64}
+ ? "LIBZ=\"\"\"".vms_info()->{def_zlib_p64}."\"\"\"" : ();
+ }),
+ ex_libs => add(sub { return vms_info()->{zlib_p64} || (); }),
},
);