diff options
| author | Guy Harris <gharris@sonic.net> | 2020-06-04 18:54:18 -0700 |
|---|---|---|
| committer | Guy Harris <gharris@sonic.net> | 2020-06-04 18:54:18 -0700 |
| commit | faf1188048bfe1529ffb143b9b8856cbd0d97180 (patch) | |
| tree | fd12018587007f5a775b0f252aca4e0540156df1 /.appveyor.yml | |
| parent | 2c9d8d2a133f3d5ac7ba43d59ef1ffb8445ff9b0 (diff) | |
appveyor: fix architecture selectio for VS 2019.
There aren't separate VS 2019 generators for 32-bit and 64-bit targets;
instead, the -A flag to CMake specifies "Win32" for 32-bit x86 and "x64"
for 64-bit x86 (and "ARM" for 32-bit ARM and "ARM64" for 64-bit ARM).
Diffstat (limited to '.appveyor.yml')
| -rw-r--r-- | .appveyor.yml | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 8025202f..cd43cfea 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,65 +20,81 @@ environment: matrix: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GENERATOR: "MinGW Makefiles" + ARCHFLAG: "" SDK: WpdPack AIRPCAP: -DDISABLE_AIRPCAP=YES MINGW_ROOT: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GENERATOR: "MinGW Makefiles" + ARCHFLAG: "" SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=YES MINGW_ROOT: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GENERATOR: "Visual Studio 14 2015" + ARCHFLAG: "" SDK: WpdPack AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GENERATOR: "Visual Studio 14 2015 Win64" + ARCHFLAG: "" SDK: WpdPack AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GENERATOR: "Visual Studio 14 2015" + ARCHFLAG: "" SDK: npcap-sdk-1.05 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 GENERATOR: "Visual Studio 14 2015 Win64" + ARCHFLAG: "" SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 15 2017" + ARCHFLAG: "" SDK: WpdPack - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 15 2017 Win64" + ARCHFLAG: "" SDK: WpdPack AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 15 2017" + ARCHFLAG: "" SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 15 2017 Win64" + ARCHFLAG: "" SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 GENERATOR: "Visual Studio 15 2017 Win64" + ARCHFLAG: "" SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=NO - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 GENERATOR: "Visual Studio 16 2019" + ARCHFLAG: "-A Win32" SDK: WpdPack - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - GENERATOR: "Visual Studio 16 2019 Win64" + GENERATOR: "Visual Studio 16 2019" + ARCHFLAG: "-A x64" SDK: WpdPack AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 GENERATOR: "Visual Studio 16 2019" + ARCHFLAG: "-A Win32" SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 GENERATOR: "Visual Studio 16 2019 Win64" + ARCHFLAG: "-A x64" SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=YES - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 GENERATOR: "Visual Studio 16 2019 Win64" + ARCHFLAG: "-A x64" SDK: npcap-sdk-1.05 AIRPCAP: -DDISABLE_AIRPCAP=NO @@ -97,6 +113,6 @@ build_script: # that breaks MinGW builds - CMake checks for that and fails in the # configuration stage - if "%GENERATOR%"=="MinGW Makefiles" set PATH=%PATH:C:\Program Files\Git\usr\bin;=% - - cmake %AIRPCAP% -DPacket_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -DPacket_ROOT=c:\projects\libpcap\Win32\%SDK% -DPacket_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -DAirPcap_ROOT=c:\projects\libpcap\Win32\Airpcap_Devpack -G"%GENERATOR%" .. + - cmake %AIRPCAP% -DPacket_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -DPacket_ROOT=c:\projects\libpcap\Win32\%SDK% -DPacket_ROOT=c:\projects\libpcap\Win32\%SDK% -G"%GENERATOR%" -DAirPcap_ROOT=c:\projects\libpcap\Win32\Airpcap_Devpack -G"%GENERATOR%" "%ARCHFLAG%" .. - if NOT "%GENERATOR%"=="MinGW Makefiles" msbuild /m /nologo /p:Configuration=Release pcap.sln - if "%GENERATOR%"=="MinGW Makefiles" mingw32-make |