diff options
| author | Jack Lloyd <[email protected]> | 2019-12-06 11:47:50 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2019-12-06 13:18:57 -0500 |
| commit | 6fccb9ccbc3a44bc3db872802d9d0d05558abf0a (patch) | |
| tree | 0defd445f0f3cb5da144854d8ab7a0b87ea3592d /src/scripts/ci | |
| parent | 74a8685830775c1463e3eb484e2faf824e6862cd (diff) | |
Fix Windows linking to consistently use .lib suffix as required
Also fix the zlib basename for Windows.
Resolves #2210
Diffstat (limited to 'src/scripts/ci')
| -rw-r--r-- | src/scripts/ci/appveyor.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scripts/ci/appveyor.yml b/src/scripts/ci/appveyor.yml index b323a1f6d..4fc88d4bc 100644 --- a/src/scripts/ci/appveyor.yml +++ b/src/scripts/ci/appveyor.yml @@ -23,7 +23,7 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 BOOST_ROOT: "C:\\Libraries\\boost_1_69_0" BOOST_LIBRARYDIR: "C:\\Libraries\\boost_1_69_0\\lib32-msvc-14.0" - BOOST_SYSTEM_LIBRARY: "libboost_system-vc140-mt-x32-1_69.lib" + BOOST_SYSTEM_LIBRARY: "libboost_system-vc140-mt-x32-1_69" MAKE_TOOL: nmake TARGET_CC: msvc @@ -34,7 +34,7 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 BOOST_ROOT: "C:\\Libraries\\boost_1_69_0" BOOST_LIBRARYDIR: "C:\\Libraries\\boost_1_69_0\\lib32-msvc-14.1" - BOOST_SYSTEM_LIBRARY: "libboost_system-vc141-mt-x32-1_69.lib" + BOOST_SYSTEM_LIBRARY: "libboost_system-vc141-mt-x32-1_69" MAKE_TOOL: jom TARGET_CC: msvc @@ -45,7 +45,7 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 BOOST_ROOT: "C:\\Libraries\\boost_1_69_0" BOOST_LIBRARYDIR: "C:\\Libraries\\boost_1_69_0\\lib64-msvc-14.1" - BOOST_SYSTEM_LIBRARY: "libboost_system-vc141-mt-x64-1_69.lib" + BOOST_SYSTEM_LIBRARY: "libboost_system-vc141-mt-x64-1_69" MAKE_TOOL: jom TARGET_CC: msvc @@ -56,7 +56,7 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 BOOST_ROOT: "C:\\Libraries\\boost_1_69_0" BOOST_LIBRARYDIR: "C:\\Libraries\\boost_1_69_0\\lib64-msvc-14.1" - BOOST_SYSTEM_LIBRARY: "libboost_system-vc141-mt-x64-1_69.lib" + BOOST_SYSTEM_LIBRARY: "libboost_system-vc141-mt-x64-1_69" MAKE_TOOL: jom TARGET_CC: msvc |