summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Configurations/50-masm.conf7
-rw-r--r--appveyor.yml6
2 files changed, 9 insertions, 4 deletions
diff --git a/Configurations/50-masm.conf b/Configurations/50-masm.conf
index 60a55072f2..84cf2f12e8 100644
--- a/Configurations/50-masm.conf
+++ b/Configurations/50-masm.conf
@@ -9,9 +9,14 @@
%targets = (
"VC-WIN64A-masm" => {
- inherit_from => [ "VC-WIN64A" ],
+ inherit_from => [ "VC-WIN64-common", asm("x86_64_asm"),
+ sub { $disabled{shared} ? () : "x86_64_uplink" } ],
as => "ml64",
asflags => "/c /Cp /Cx /Zi",
asoutflag => "/Fo",
+ sys_id => "WIN64A",
+ bn_asm_src => sub { return undef unless @_;
+ my $r=join(" ",@_); $r=~s|asm/x86_64-gcc|bn_asm|; $r; },
+ perlasm_scheme => "masm",
},
);
diff --git a/appveyor.yml b/appveyor.yml
index af2bfede52..d47c6cd6d7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,10 +14,10 @@ before_build:
- ps: >-
If ($env:Platform -Match "x86") {
$env:VCVARS_PLATFORM="x86"
- $env:TARGET="VC-WIN32"
+ $env:TARGET="VC-WIN32 no-asm"
} Else {
$env:VCVARS_PLATFORM="amd64"
- $env:TARGET="VC-WIN64A"
+ $env:TARGET="VC-WIN64A-masm"
}
- ps: >-
If ($env:Configuration -Match "shared") {
@@ -29,7 +29,7 @@ before_build:
- call "%VSCOMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM%
- mkdir _build
- cd _build
- - perl ..\Configure %TARGET% no-asm %SHARED%
+ - perl ..\Configure %TARGET% %SHARED%
- cd ..
build_script: