From 41dd3e1e90a88fb80ab7e84f47c85a8abd133583 Mon Sep 17 00:00:00 2001 From: Matt Alvarado Date: Thu, 7 Nov 2024 10:49:55 -0500 Subject: [PATCH 1/3] Have CI build under windows --- .github/workflows/build.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4f4d664..3a22af3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,3 +32,16 @@ jobs: cmake --build build -j "$(nproc)" make -C build test cmake --install build + + buildwindows: + name: build for windows + runs-on: windows-2022 + + steps: + - uses: actions/checkout@v4 + - id: build-release + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Release + run: cmake --build ${{github.workspace}}/build --config Release --target install -- /m:10 + - id: build-debug + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Debug + run: cmake --build ${{github.workspace}}/build --config Debug --target install -- /m:10 From c172debeafcbd870b7a3db1b08bef9a080813b46 Mon Sep 17 00:00:00 2001 From: Matt Alvarado Date: Thu, 7 Nov 2024 11:33:36 -0500 Subject: [PATCH 2/3] Fix syntax error --- .github/workflows/build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3a22af3..7bfefc0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,8 +40,10 @@ jobs: steps: - uses: actions/checkout@v4 - id: build-release - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Release - run: cmake --build ${{github.workspace}}/build --config Release --target install -- /m:10 + run: | + cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Release + cmake --build ${{github.workspace}}/build --config Release --target install -- /m:10 - id: build-debug - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Debug - run: cmake --build ${{github.workspace}}/build --config Debug --target install -- /m:10 + run: | + cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=Debug + cmake --build ${{github.workspace}}/build --config Debug --target install -- /m:10 From 626b493d200e7ee559e89d63f94833f6c4d7a914 Mon Sep 17 00:00:00 2001 From: Matt Alvarado Date: Thu, 7 Nov 2024 12:28:02 -0500 Subject: [PATCH 3/3] Source updates --- source/LibMultiSense/details/public.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/LibMultiSense/details/public.cc b/source/LibMultiSense/details/public.cc index 33ab5b6..10f649c 100644 --- a/source/LibMultiSense/details/public.cc +++ b/source/LibMultiSense/details/public.cc @@ -1345,15 +1345,15 @@ Status impl::getMtu(int32_t& mtu) Status impl::setBestMtu() { - uint cur_mtu = MAX_MTU_SIZE; - uint max_mtu = MAX_MTU_SIZE; - uint min_mtu = MIN_MTU_SIZE; - uint bisections = 0; + uint32_t cur_mtu = MAX_MTU_SIZE; + uint32_t max_mtu = MAX_MTU_SIZE; + uint32_t min_mtu = MIN_MTU_SIZE; + uint32_t bisections = 0; Status status = Status_Ok; // // v2.2 and older do not support testing MTU - + if (m_sensorVersion.firmwareVersion <= 0x0202) return Status_Unsupported;