Skip to content

Commit 42750ef

Browse files
authored
Merge pull request #283 from chfast/ci-windows
Enable 32-bit Windows build in CircleCI
2 parents 1e964da + 24daa0a commit 42750ef

File tree

2 files changed

+36
-1
lines changed

2 files changed

+36
-1
lines changed

circle.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
version: 2.1
2+
orbs:
3+
win: circleci/windows@5.0
24

35
executors:
46
linux-gcc-latest:
@@ -287,6 +289,38 @@ jobs:
287289
- build_and_test
288290
- benchmark
289291

292+
windows-32bit:
293+
executor: win/server-2022
294+
steps:
295+
- checkout
296+
- run:
297+
name: "Setup environment (bash)"
298+
shell: bash
299+
command: |
300+
echo 'export PATH=$PATH:"/c/Program Files/Microsoft Visual Studio/2022/Community/Common7/IDE/CommonExtensions/Microsoft/CMake/CMake/bin"' >> $BASH_ENV
301+
- run:
302+
name: 'Configure'
303+
shell: powershell
304+
command: |
305+
$ErrorActionPreference = "Stop"
306+
& 'C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1' -Arch x86
307+
which cmake
308+
cmake -S . -B ~/build -G Ninja -DCMAKE_INSTALL_PREFIX=C:\install -DCMAKE_BUILD_TYPE=Release -DINTX_BENCHMARKING=OFF
309+
- run:
310+
name: 'Build'
311+
shell: powershell
312+
command: |
313+
$ErrorActionPreference = "Stop"
314+
& 'C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1' -Arch x86
315+
cmake --build ~/build
316+
- run:
317+
name: 'Test'
318+
shell: powershell
319+
working_directory: ~/build
320+
command: |
321+
$ErrorActionPreference = "Stop"
322+
& 'C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1' -Arch x86
323+
ctest -j4 --output-on-failure --schedule-random
290324
291325
cmake-min:
292326
docker:
@@ -312,3 +346,4 @@ workflows:
312346
- cmake-min
313347
- arm64
314348
- powerpc64
349+
- windows-32bit

include/intx/intx.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ inline constexpr uint128 umul(uint64_t x, uint64_t y) noexcept
440440
{
441441
#if INTX_HAS_BUILTIN_INT128
442442
return builtin_uint128{x} * builtin_uint128{y};
443-
#elif defined(_MSC_VER) && _MSC_VER >= 1925
443+
#elif defined(_MSC_VER) && _MSC_VER >= 1925 && defined(_M_X64)
444444
if (!is_constant_evaluated())
445445
{
446446
unsigned __int64 hi = 0;

0 commit comments

Comments
 (0)