$vc_win64a_info = { as => "nasm",
asflags => "-f win64 -DNEAR -Ox -g",
asoutflag => "-o" };
- } else {
+ } elsif ($disabled{asm}) {
$vc_win64a_info = { as => "ml64",
asflags => "/c /Cp /Cx /Zi",
asoutflag => "/Fo" };
+ } else {
+ die "NASM not found - please read INSTALL and NOTES.WIN for further details\n";
}
}
return $vc_win64a_info;
}
+my $vc_win32_info = {};
+sub vc_win32_info {
+ unless (%$vc_win32_info) {
+ my $ver=`nasm -v 2>NUL`;
+ my $vew=`nasmw -v 2>NUL`;
+ if ($ver ne "" || $vew ne "") {
+ $vc_win32_info = { as => $ver ge $vew ? "nasm" : "nasmw",
+ asflags => "-f win32",
+ asoutflag => "-o",
+ perlasm_scheme => "win32n" };
+ } elsif ($disabled{asm}) {
+ $vc_win32_info = { as => "ml",
+ asflags => "/nologo /Cp /coff /c /Cx /Zi",
+ asoutflag => "/Fo",
+ perlasm_scheme => "win32" };
+ } else {
+ die "NASM not found - please read INSTALL and NOTES.WIN for further details\n";
+ }
+ }
+ return $vc_win32_info;
+}
+
my $vc_wince_info = {};
sub vc_wince_info {
unless (%$vc_wince_info) {
release => sub { $disabled{shared} ? "/MT" : () },
)),
bin_lflags => add("/subsystem:console /opt:ref"),
- ex_libs => sub {
+ ex_libs => add(sub {
my @ex_libs = ();
push @ex_libs, 'ws2_32.lib' unless $disabled{sock};
push @ex_libs, 'gdi32.lib advapi32.lib crypt32.lib user32.lib';
return join(" ", @ex_libs);
- },
+ }),
},
"VC-WIN64-common" => {
inherit_from => [ "VC-noCE-common" ],
- ex_libs => sub {
+ ex_libs => add(sub {
my @ex_libs = ();
push @ex_libs, 'bufferoverflowu.lib' if (`cl 2>&1` =~ /14\.00\.4[0-9]{4}\./);
return join(" ", @_, @ex_libs);
- },
+ }),
bn_ops => "SIXTY_FOUR_BIT EXPORT_VAR_AS_FN",
build_scheme => add("VC-W64", { separator => undef }),
},
# configure with 'perl Configure VC-WIN32 -DUNICODE -D_UNICODE'
inherit_from => [ "VC-noCE-common", asm("x86_asm"),
sub { $disabled{shared} ? () : "uplink_common" } ],
- as => sub { my $ver=`nasm -v 2>NUL`;
- my $vew=`nasmw -v 2>NUL`;
- return $ver ge $vew ? "nasm" : "nasmw" },
- asflags => "-f win32",
- asoutflag => "-o",
- ex_libs => sub {
+ as => sub { vc_win32_info()->{as} },
+ asflags => sub { vc_win32_info()->{asflags} },
+ asoutflag => sub { vc_win32_info()->{asoutflag} },
+ ex_libs => add(sub {
my @ex_libs = ();
# WIN32 UNICODE build gets linked with unicows.lib for
# backward compatibility with Win9x.
push @ex_libs, 'unicows.lib'
if (grep { $_ eq "UNICODE" } @user_defines);
return join(" ", @ex_libs, @_);
- },
+ }),
sys_id => "WIN32",
bn_ops => "BN_LLONG EXPORT_VAR_AS_FN",
- perlasm_scheme => "win32n",
+ perlasm_scheme => sub { vc_win32_info()->{perlasm_scheme} },
build_scheme => add("VC-W32", { separator => undef }),
},
"VC-CE" => {
? "/entry:mainCRTstartup" : (); }),
sys_id => "WINCE",
bn_ops => "BN_LLONG EXPORT_VAR_AS_FN",
- ex_libs => sub {
+ ex_libs => add(sub {
my @ex_libs = ();
push @ex_libs, 'ws2.lib' unless $disabled{sock};
push @ex_libs, 'crypt32.lib';
push @ex_libs, ' /nodefaultlib coredll.lib corelibc.lib'
if ($ENV{'TARGETCPU'} eq "X86");
return @ex_libs;
- },
+ }),
build_scheme => add("VC-WCE", { separator => undef }),
},
release => "-fomit-frame-pointer")),
bn_ops => "BN_LLONG",
},
+ # Haiku builds with no-asm
"haiku-x86_64" => {
inherit_from => [ "haiku-common", asm("x86_64_asm") ],
cflags => add("-m64"),
- bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
+ bn_ops => "SIXTY_FOUR_BIT_LONG",
},
inherit_from => [ "BASE_VMS" ],
template => 1,
cc => "CC/DECC",
- cflags => picker(default => "/STANDARD=RELAXED/NOLIST/PREFIX=ALL/NAMES=(AS_IS,SHORTENED)",
+ cflags => picker(default => "/STANDARD=RELAXED/NOLIST/PREFIX=ALL",
debug => "/NOOPTIMIZE/DEBUG",
release => "/OPTIMIZE/NODEBUG"),
lflags => picker(default => "/MAP",
debug => "/DEBUG/TRACEBACK",
release => "/NODEBUG/NOTRACEBACK"),
+ lib_cflags => add("/NAMES=(AS_IS,SHORTENED)"),
+ dso_cflags => add("/NAMES=(AS_IS,SHORTENED)"),
shared_target => "vms-shared",
dso_scheme => "vms",
thread_scheme => "pthreads",