From e0f7552fc1a13990f70da863c5fdaa1f64be649f Mon Sep 17 00:00:00 2001
From: nightwalker-87 <15526941+Nightwalker-87@users.noreply.github.com>
Date: Sat, 3 Apr 2021 14:53:16 +0200
Subject: [PATCH] Updated CI build configuration

- Ensure clean build system for all build targets
- Rearranged & renamed build jobs
- Completed set of 32-bit & 64-bit builds
- Updated notifications for MinGW cross build
- Added macOS 10.14 build environment for Travis CI
---
 .github/workflows/c-cpp.yml    | 543 ++++++++++++++++++---------------
 .travis.sh                     |   4 +-
 .travis.yml                    | 177 ++++-------
 cmake/modules/Findlibusb.cmake |   2 +
 4 files changed, 359 insertions(+), 367 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index b42d001..4769450 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -7,51 +7,10 @@ on:
     branches: [master, develop, testing]
 
 jobs:
-  job_linux_1a:
-    name: ubuntu-20.04 gcc
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
-      - name: make debug
-        run: make debug
-      - name: make test
-        run: make test
-      - name: make release
-        run: make release
-      - name: sudo make install
-        run: sudo make install
-      - name: sudo make package
-        run: sudo make package
-      - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
 
-  job_linux_2a:
-    name: ubuntu-18.04 gcc
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: install dependencies
-        run: sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
-      - name: make debug
-        run: make debug
-      - name: make test
-        run: make test
-      - name: make release
-        run: make release
-      - name: sudo make install
-        run: sudo make install
-      - name: sudo make package
-        run: sudo make package
-      - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+# Linux
 
-  job_linux_3a:
+  job_linux_16_04_64_gcc:
     name: ubuntu-16.04 gcc
     runs-on: ubuntu-16.04
     steps:
@@ -59,141 +18,19 @@ jobs:
       - name: Install dependencies
         run: sudo apt-get install gcc-5 libusb-1.0.0-dev libgtk-3-dev rpm
       - name: make debug
-        run: make debug
+        run: sudo make clean && make debug
       - name: make test
-        run: make test
+        run: sudo make clean && make test
       - name: make release
-        run: make release
+        run: sudo make clean && make release
       - name: sudo make install
-        run: sudo make install
+        run: sudo make clean && sudo make install
       - name: sudo make package
         run: sudo make package
       - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+        run: sudo make uninstall && sudo make clean
 
-  job_linux_1b:
-    name: ubuntu-20.04 clang
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
-      - name: make debug
-        run: make debug
-      - name: make test
-        run: make test
-      - name: make release
-        run: make release
-      - name: sudo make install
-        run: sudo make install
-      - name: sudo make package
-        run: sudo make package
-      - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
-
-  job_linux_2b:
-    name: ubuntu-18.04 clang
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: install dependencies
-        run: sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
-      - name: make debug
-        run: make debug
-      - name: make test
-        run: make test
-      - name: make release
-        run: make release
-      - name: sudo make install
-        run: sudo make install
-      - name: sudo make package
-        run: sudo make package
-      - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
-
-  job_linux_3b:
-    name: ubuntu-16.04 clang
-    runs-on: ubuntu-16.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: sudo apt-get install clang libusb-1.0.0-dev libgtk-3-dev rpm
-      - name: make debug
-        run: make debug
-      - name: make test
-        run: make test
-      - name: make release
-        run: make release
-      - name: sudo make install
-        run: sudo make install
-      - name: sudo make package
-        run: sudo make package
-      - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
-
-  job_linux_1c:
-    name: ubuntu-20.04 gcc 32-bit
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
-      - name: Set compiler flags
-        run: |
-          CFLAGS="$CFLAGS -m32"
-          CXXFLAGS="$CXXFLAGS -m32"
-          LDFLAGS="$LDFLAGS -m32"
-      - name: make debug
-        run: make debug
-      - name: make test
-        run: make test
-      - name: make release
-        run: make release
-      - name: sudo make install
-        run: sudo make install
-      - name: sudo make package
-        run: sudo make package
-      - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
-
-  job_linux_2c:
-    name: ubuntu-18.04 gcc 32-bit
-    runs-on: ubuntu-18.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: install dependencies
-        run: sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
-      - name: Set compiler flags
-        run: |
-          CFLAGS="$CFLAGS -m32"
-          CXXFLAGS="$CXXFLAGS -m32"
-          LDFLAGS="$LDFLAGS -m32"
-      - name: make debug
-        run: make debug
-      - name: make test
-        run: make test
-      - name: make release
-        run: make release
-      - name: sudo make install
-        run: sudo make install
-      - name: sudo make package
-        run: sudo make package
-      - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
-
-  job_linux_3c:
+  job_linux_16_04_32_gcc:
     name: ubuntu-16.04 gcc 32-bit
     runs-on: ubuntu-16.04
     steps:
@@ -206,65 +43,246 @@ jobs:
           CXXFLAGS="$CXXFLAGS -m32"
           LDFLAGS="$LDFLAGS -m32"
       - name: make debug
-        run: make debug
+        run: sudo make clean && make debug
       - name: make test
-        run: make test
+        run: sudo make clean && make test
       - name: make release
-        run: make release
+        run: sudo make clean && make release
       - name: sudo make install
-        run: sudo make install
+        run: sudo make clean && sudo make install
       - name: sudo make package
         run: sudo make package
       - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+        run: sudo make uninstall && sudo make clean
 
-  job_linux_4:
-    name: ubuntu-20.04 mingw64
+  job_linux_16_04_64_clang:
+    name: ubuntu-16.04 clang
+    runs-on: ubuntu-16.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: sudo apt-get install clang-3.5 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: make debug
+        run: sudo make clean && make debug
+      - name: make test
+        run: sudo make clean && make test
+      - name: make release
+        run: sudo make clean && make release
+      - name: sudo make install
+        run: sudo make clean && sudo make install
+      - name: sudo make package
+        run: sudo make package
+      - name: sudo make uninstall
+        run: sudo make uninstall && sudo make clean
+
+  job_linux_16_04_32_clang:
+    name: ubuntu-16.04 clang 32-bit
+    runs-on: ubuntu-16.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: sudo apt-get install clang-3.5 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: Set compiler flags
+        run: |
+          CFLAGS="$CFLAGS -m32"
+          CXXFLAGS="$CXXFLAGS -m32"
+          LDFLAGS="$LDFLAGS -m32"
+      - name: make debug
+        run: sudo make clean && make debug
+      - name: make test
+        run: sudo make clean && make test
+      - name: make release
+        run: sudo make clean && make release
+      - name: sudo make install
+        run: sudo make clean && sudo make install
+      - name: sudo make package
+        run: sudo make package
+      - name: sudo make uninstall
+        run: sudo make uninstall && sudo make clean
+
+  job_linux_18_04_64_gcc:
+    name: ubuntu-18.04 gcc
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: install dependencies
+        run: sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: make debug
+        run: sudo make clean && make debug
+      - name: make test
+        run: sudo make clean && make test
+      - name: make release
+        run: sudo make clean && make release
+      - name: sudo make install
+        run: sudo make clean && sudo make install
+      - name: sudo make package
+        run: sudo make package
+      - name: sudo make uninstall
+        run: sudo make uninstall && sudo make clean
+
+  job_linux_18_04_32_gcc:
+    name: ubuntu-18.04 gcc 32-bit
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: install dependencies
+        run: sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: Set compiler flags
+        run: |
+          CFLAGS="$CFLAGS -m32"
+          CXXFLAGS="$CXXFLAGS -m32"
+          LDFLAGS="$LDFLAGS -m32"
+      - name: make debug
+        run: sudo make clean && make debug
+      - name: make test
+        run: sudo make clean && make test
+      - name: make release
+        run: sudo make clean && make release
+      - name: sudo make install
+        run: sudo make clean && sudo make install
+      - name: sudo make package
+        run: sudo make package
+      - name: sudo make uninstall
+        run: sudo make uninstall && sudo make clean
+  
+  job_linux_18_04_64_clang:
+    name: ubuntu-18.04 clang
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: install dependencies
+        run: sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: make debug
+        run: sudo make clean && make debug
+      - name: make test
+        run: sudo make clean && make test
+      - name: make release
+        run: sudo make clean && make release
+      - name: sudo make install
+        run: sudo make clean && sudo make install
+      - name: sudo make package
+        run: sudo make package
+      - name: sudo make uninstall
+        run: sudo make uninstall && sudo make clean
+
+  job_linux_18_04_32_clang:
+    name: ubuntu-18.04 clang 32-bit
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: Set compiler flags
+        run: |
+          CFLAGS="$CFLAGS -m32"
+          CXXFLAGS="$CXXFLAGS -m32"
+          LDFLAGS="$LDFLAGS -m32"
+      - name: make debug
+        run: sudo make clean && make debug
+      - name: make test
+        run: sudo make clean && make test
+      - name: make release
+        run: sudo make clean && make release
+      - name: sudo make install
+        run: sudo make clean && sudo make install
+      - name: sudo make package
+        run: sudo make package
+      - name: sudo make uninstall
+        run: sudo make uninstall && sudo make clean
+
+  job_linux_20_04_64_gcc:
+    name: ubuntu-20.04 gcc
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm mingw-w64
+        run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
       - name: make debug
-        run: make debug
+        run: sudo make clean && make debug
       - name: make test
-        run: make test
+        run: sudo make clean && make test
       - name: make release
-        run: make release
+        run: sudo make clean && make release
       - name: sudo make install
-        run: sudo make install
+        run: sudo make clean && sudo make install
       - name: sudo make package
         run: sudo make package
       - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+        run: sudo make uninstall && sudo make clean
 
-  # job_macos_1a:
-  #   name: macos-11.0 gcc
-  #   runs-on: macos-11.0
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Install dependencies
-  #       run: brew install gcc libusb gtk+3
-  #     - name: make debug
-  #       run: make debug
-  #     - name: make test
-  #       run: make test
-  #     - name: make release
-  #       run: make release
-  #     - name: sudo make install
-  #       run: sudo make install
-  #     - name: sudo make package
-  #       run: sudo make package
-  #     - name: sudo make uninstall
-  #       run: sudo make uninstall
-  #     - name: sudo make clean
-  #       run: sudo make clean
+  job_linux_20_04_32_gcc:
+    name: ubuntu-20.04 gcc 32-bit
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: Set compiler flags
+        run: |
+          CFLAGS="$CFLAGS -m32"
+          CXXFLAGS="$CXXFLAGS -m32"
+          LDFLAGS="$LDFLAGS -m32"
+      - name: make debug
+        run: sudo make clean && make debug
+      - name: make test
+        run: sudo make clean && make test
+      - name: make release
+        run: sudo make clean && make release
+      - name: sudo make install
+        run: sudo make clean && sudo make install
+      - name: sudo make package
+        run: sudo make package
+      - name: sudo make uninstall
+        run: sudo make uninstall && sudo make clean
 
-  job_macos_2a:
+  job_linux_20_04_64_clang:
+    name: ubuntu-20.04 clang
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: make debug
+        run: sudo make clean && make debug
+      - name: make test
+        run: sudo make clean && make test
+      - name: make release
+        run: sudo make clean && make release
+      - name: sudo make install
+        run: sudo make clean && sudo make install
+      - name: sudo make package
+        run: sudo make package
+      - name: sudo make uninstall
+        run: sudo make uninstall && sudo make clean
+
+  job_linux_20_04_32_clang:
+    name: ubuntu-20.04 clang 32-bit
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
+      - name: Set compiler flags
+        run: |
+          CFLAGS="$CFLAGS -m32"
+          CXXFLAGS="$CXXFLAGS -m32"
+          LDFLAGS="$LDFLAGS -m32"
+      - name: make debug
+        run: sudo make clean && make debug
+      - name: make test
+        run: sudo make clean && make test
+      - name: make release
+        run: sudo make clean && make release
+      - name: sudo make install
+        run: sudo make clean && sudo make install
+      - name: sudo make package
+        run: sudo make package
+      - name: sudo make uninstall
+        run: sudo make uninstall && sudo make clean
+
+# macOS
+
+  job_macos_10_15_gcc:
     name: macos-10.15 gcc
     runs-on: macos-10.15
     steps:
@@ -272,43 +290,19 @@ jobs:
       - name: Install dependencies
         run: brew install gcc libusb gtk+3
       - name: make debug
-        run: make debug
+        run: sudo make clean && make debug
       - name: make test
-        run: make test
+        run: sudo make clean && make test
       - name: make release
-        run: make release
+        run: sudo make clean && make release
       - name: sudo make install
-        run: sudo make install
+        run: sudo make clean && sudo make install
       - name: sudo make package
         run: sudo make package
       - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+        run: sudo make uninstall && sudo make clean
 
-  # job_macos_1b:
-  #   name: macos-11.0 clang
-  #   runs-on: macos-11.0
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Install dependencies
-  #       run: brew install llvm libusb gtk+3
-  #     - name: make debug
-  #       run: make debug
-  #     - name: make test
-  #       run: make test
-  #     - name: make release
-  #       run: make release
-  #     - name: sudo make install
-  #       run: sudo make install
-  #     - name: sudo make package
-  #       run: sudo make package
-  #     - name: sudo make uninstall
-  #       run: sudo make uninstall
-  #     - name: sudo make clean
-  #       run: sudo make clean
-
-  job_macos_2b:
+  job_macos_10_15_clang:
     name: macos-10.15 clang
     runs-on: macos-10.15
     steps:
@@ -316,16 +310,71 @@ jobs:
       - name: Install dependencies
         run: brew install llvm libusb gtk+3
       - name: make debug
-        run: make debug
+        run: sudo make clean && make debug
       - name: make test
-        run: make test
+        run: sudo make clean && make test
       - name: make release
-        run: make release
+        run: sudo make clean && make release
       - name: sudo make install
-        run: sudo make install
+        run: sudo make clean && sudo make install
       - name: sudo make package
         run: sudo make package
       - name: sudo make uninstall
-        run: sudo make uninstall
-      - name: sudo make clean
-        run: sudo make clean
+        run: sudo make uninstall && sudo make clean
+
+  # job_macos_11_gcc:
+  #   name: macos-11.0 gcc
+  #   runs-on: macos-11.0
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - name: Install dependencies
+  #       run: brew install gcc libusb gtk+3
+  #     - name: make debug
+  #       run: sudo make clean && make debug
+  #     - name: make test
+  #       run: sudo make clean && make test
+  #     - name: make release
+  #       run: sudo make clean && make release
+  #     - name: sudo make install
+  #       run: sudo make clean && sudo make install
+  #     - name: sudo make package
+  #       run: sudo make package
+  #     - name: sudo make uninstall
+  #       run: sudo make uninstall && sudo make clean
+
+  # job_macos_11_clang:
+  #   name: macos-11.0 clang
+  #   runs-on: macos-11.0
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - name: Install dependencies
+  #       run: brew install llvm libusb gtk+3
+  #     - name: make debug
+  #       run: sudo make clean && make debug
+  #     - name: make test
+  #       run: sudo make clean && make test
+  #     - name: make release
+  #       run: sudo make clean && make release
+  #     - name: sudo make install
+  #       run: sudo make clean && sudo make install
+  #     - name: sudo make package
+  #       run: sudo make package
+  #     - name: sudo make uninstall
+  #       run: sudo make uninstall && sudo make clean
+
+# Linux MinGW cross compliation
+
+  # job_linux_20_04_cross:
+  #   name: ubuntu-20.04 mingw64
+  #   runs-on: ubuntu-20.04
+  #   steps:
+  #     - uses: actions/checkout@v2
+  #     - name: Install dependencies
+  #       run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm mingw-w64
+  #     - name: Building Release for Windows (x86-64) ...
+  #       run: sudo mkdir -p build-mingw && cd build-mingw && sudo cmake \
+  #         -DCMAKE_SYSTEM_NAME=Windows \
+  #         -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
+  #         -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake \
+  #         -DCMAKE_INSTALL_PREFIX=$PWD/install $PWD && \
+  #         sudo make && sudo rm -rf build-mingw && cd -
diff --git a/.travis.sh b/.travis.sh
index 7683af0..de2a423 100755
--- a/.travis.sh
+++ b/.travis.sh
@@ -9,13 +9,13 @@ echo "WORK DIR:$DIR"
 DIR=$PWD
 
 if [ "$TRAVIS_JOB_NAME" == "linux-mingw" ]; then
-    echo "--> Building Release for Windows (x86-64) ..."
+    echo "--> Building for Windows (x86-64) ..."
     mkdir -p build-mingw && cd build-mingw
     cmake -DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
           -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
     make && rm -rf build-mingw && cd -
 
-    echo "--> Building Release for Windows (i686) ..."
+    echo "--> Building for Windows (i686) ..."
     mkdir -p build-mingw && cd build-mingw
     cmake -DCMAKE_SYSTEM_NAME=Windows -DTOOLCHAIN_PREFIX=i686-w64-mingw32 \
           -DCMAKE_TOOLCHAIN_FILE=$PWD/../cmake/modules/set_toolchain.cmake -DCMAKE_INSTALL_PREFIX=$PWD/install $DIR
diff --git a/.travis.yml b/.travis.yml
index e866cc6..2a788fd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,23 +2,7 @@ language: c
 
 jobs:
   include:
-    ### 64-bit builds on AMD64 ###
-    - os: linux
-      dist: xenial
-      env: BADGE=linux
-      compiler: gcc-5
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["gcc-5", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-    - os: linux
-      dist: bionic
-      env: BADGE=linux
-      compiler: gcc-6
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["gcc-6", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
+    ### 64-bit build on AMD64 ###
     - os: linux
       dist: focal
       env: BADGE=linux
@@ -27,30 +11,18 @@ jobs:
         apt:
           sources: ["ubuntu-toolchain-r-test"]
           packages: ["gcc-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-    - os: linux
-      dist: xenial
-      env: BADGE=linux
-      compiler: clang
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-    - os: linux
-      dist: bionic
-      env: BADGE=linux
-      compiler: clang-10
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["clang-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
+
+    ### 32-bit build on AMD64 ###
     - os: linux
       dist: focal
       env: BADGE=linux
-      compiler: clang-10
+      compiler: gcc-10
       addons:
         apt:
           sources: ["ubuntu-toolchain-r-test"]
-          packages: ["clang-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
+          packages: ["gcc-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
+      before_install:
+        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
 
     ### cross build on AMD64 ###
     - os: linux
@@ -63,92 +35,61 @@ jobs:
           sources: ["ubuntu-toolchain-r-test"]
           packages:
             ["gcc-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm", "mingw-w64"]
-
-    ### 32-bit builds on AMD64 ###
-    - os: linux
-      dist: xenial
-      env: BADGE=linux
-      compiler: gcc-5
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["gcc-5", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
       before_install:
-        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
-    - os: linux
-      dist: bionic
-      env: BADGE=linux
-      compiler: gcc-6
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["gcc-6", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-      before_install:
-        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
-    - os: linux
-      dist: focal
-      env: BADGE=linux
-      compiler: gcc-10
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["gcc-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-      before_install:
-        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
-    - os: linux
-      dist: xenial
-      env: BADGE=linux
-      compiler: clang
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-      before_install:
-        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
-    - os: linux
-      dist: bionic
-      env: BADGE=linux
-      compiler: clang-10
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["clang-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-      before_install:
-        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
-    - os: linux
-      dist: focal
-      env: BADGE=linux
-      compiler: clang-10
-      addons:
-        apt:
-          sources: ["ubuntu-toolchain-r-test"]
-          packages: ["clang-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm"]
-      before_install:
-        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
+        - LDFLAGS="$LDFLAGS -NDEBUG";
 
     ### macOS ###
-    - os: osx
-      env: BADGE=osx
-      osx_image: xcode12.2
-      name: macOS 10.15.7
-      compiler: gcc
-      addons:
-        homebrew:
-          packages:
-            - gcc
-            - libusb
-            - gtk+3
-    - os: osx
-      env: BADGE=osx
-      osx_image: xcode12.2
-      name: macOS 10.15.7
-      compiler: clang
-      addons:
-        homebrew:
-          packages:
-            - llvm
-            - libusb
-            - gtk+3
+    # - os: osx
+    #   env: BADGE=osx
+    #   osx_image: xcode11.3
+    #   name: macOS 10.14.6 gcc
+    #   compiler: gcc
+    #   addons:
+    #     homebrew:
+    #       packages:
+    #         - gcc
+    #         - libusb
+    #         - gtk+3
+
+    # - os: osx
+    #   env: BADGE=osx
+    #   osx_image: xcode11.3
+    #   name: macOS 10.14.6 gcc 32-bit
+    #   compiler: gcc
+    #   addons:
+    #     homebrew:
+    #       packages:
+    #         - gcc
+    #         - libusb
+    #         - gtk+3
+    #   before_install:
+    #     - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
+
+    # - os: osx
+    #   env: BADGE=osx
+    #   osx_image: xcode11.3
+    #   name: macOS 10.14.6 clang
+    #   compiler: clang
+    #   addons:
+    #     homebrew:
+    #       packages:
+    #         - llvm
+    #         - libusb
+    #         - gtk+3
+
+    # - os: osx
+    #   env: BADGE=osx
+    #   osx_image: xcode11.3
+    #   name: macOS 10.14.6 clang 32-bit
+    #   compiler: clang
+    #   addons:
+    #     homebrew:
+    #       packages:
+    #         - llvm
+    #         - libusb
+    #         - gtk+3
+    #   before_install:
+    #     - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";
 
 script:
   - git fetch --tags
diff --git a/cmake/modules/Findlibusb.cmake b/cmake/modules/Findlibusb.cmake
index bc61377..3082a95 100644
--- a/cmake/modules/Findlibusb.cmake
+++ b/cmake/modules/Findlibusb.cmake
@@ -46,8 +46,10 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 elseif (WIN32 OR (EXISTS "/etc/debian_version" AND MINGW))                      # Windows or MinGW-toolchain on Debian
     # for MinGW/MSYS/MSVC: 64-bit or 32-bit?
     if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+        message(STATUS "=== Building for Windows (x86-64) ===")
         set(ARCH 64)
     else ()
+        message(STATUS "=== Building for Windowsm (i686) ===")
         set(ARCH 32)
     endif ()