Revert "Updated libusb to v1.0.24"

This reverts commit 89a495d169.

.gitignore

@@ -1,6 +1,5 @@
 build
 build-mingw
-build-mingw-*
 
 .project
 .cmake/

.travis.sh

@@ -8,20 +8,20 @@ echo "----"
 echo "WORK DIR:$DIR"
 DIR=$PWD
 
-if [ "$TRAVIS_JOB_NAME" == "linux-mingw-32" ]; then
+if [ "$TRAVIS_JOB_NAME" == "linux-mingw-64" ]; then
+    echo "--> Building for Windows (x86-64) ..."
+    mkdir -p build-mingw && cd build-mingw-64
+    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-64 && cd -
+
+elif [ "$TRAVIS_JOB_NAME" == "linux-mingw-32" ]; then
     echo "--> Building for Windows (i686) ..."
-    mkdir -p build-mingw-32 && cd build-mingw-32
+    mkdir -p build-mingw && cd build-mingw-32
     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
     make && rm -rf build-mingw-32 && cd -
 
-# elif [ "$TRAVIS_JOB_NAME" == "linux-mingw-64" ]; then
-#     echo "--> Building for Windows (x86-64) ..."
-#     mkdir -p build-mingw-64 && cd build-mingw-64
-#     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-64 && cd -
-
 elif [ "$TRAVIS_OS_NAME" == "linux" ]; then
     sudo apt-get update -qq || true
 

.travis.yml

@@ -6,8 +6,8 @@ jobs:
 
     - os: linux
       dist: focal
-      env: BADGE=linux-mingw-32
-      name: linux-mingw-32
+      env: BADGE=linux-mingw-64
+      name: linux-mingw
       compiler: gcc-10
       addons:
         apt:
@@ -15,16 +15,16 @@ jobs:
           packages:
             ["gcc-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm", "mingw-w64"]
 
-    # - os: linux
-    #   dist: focal
-    #   env: BADGE=linux-mingw-64
-    #   name: linux-mingw-64
-    #   compiler: gcc-10
-    #   addons:
-    #     apt:
-    #       sources: ["ubuntu-toolchain-r-test"]
-    #       packages:
-    #         ["gcc-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm", "mingw-w64"]
+    - os: linux
+      dist: focal
+      env: BADGE=linux-mingw-32
+      name: linux-mingw
+      compiler: gcc-10
+      addons:
+        apt:
+          sources: ["ubuntu-toolchain-r-test"]
+          packages:
+            ["gcc-10", "libusb-1.0.0-dev", "libgtk-3-dev", "rpm", "mingw-w64"]
 
 script:
   - git fetch --tags

cmake/modules/Findlibusb.cmake

@@ -77,7 +77,7 @@ elseif (WIN32 OR (EXISTS "/etc/debian_version" AND MINGW)) # Windows or MinGW-to
 
     if (NOT LIBUSB_FOUND)
         # Preparations for installing libusb library
-        set(LIBUSB_WIN_VERSION 1.0.24)                  # set libusb version
+        set(LIBUSB_WIN_VERSION 1.0.23)                  # set libusb version
         set(LIBUSB_WIN_ARCHIVE libusb-${LIBUSB_WIN_VERSION}.7z)
         if (WIN32 AND NOT EXISTS "/etc/debian_version") # ... on native Windows systems
             set(LIBUSB_WIN_ARCHIVE_PATH ${CMAKE_BINARY_DIR}/${LIBUSB_WIN_ARCHIVE})
@@ -94,7 +94,7 @@ elseif (WIN32 OR (EXISTS "/etc/debian_version" AND MINGW)) # Windows or MinGW-to
             message(STATUS "downloading libusb ${LIBUSB_WIN_VERSION}")
             file(DOWNLOAD
                 https://sourceforge.net/projects/libusb/files/libusb-1.0/libusb-${LIBUSB_WIN_VERSION}/libusb-${LIBUSB_WIN_VERSION}.7z/download
-                ${LIBUSB_WIN_ARCHIVE_PATH} EXPECTED_MD5 5c944b1c8aa9d43e026a94302d0f8ac4
+                ${LIBUSB_WIN_ARCHIVE_PATH} EXPECTED_MD5 cf3d38d2ff053ef343d10c0b8b0950c2
                 )
         endif ()
 
@@ -128,7 +128,7 @@ elseif (WIN32 OR (EXISTS "/etc/debian_version" AND MINGW)) # Windows or MinGW-to
             set(LIBUSB_NAME libusb-1.0.lib)
             find_library(
                 LIBUSB_LIBRARY NAMES ${LIBUSB_NAME}
-                HINTS ${LIBUSB_WIN_OUTPUT_FOLDER}/**/MS${ARCH}/dll
+                HINTS ${LIBUSB_WIN_OUTPUT_FOLDER}/MS${ARCH}/dll
                 NO_DEFAULT_PATH
                 NO_CMAKE_FIND_ROOT_PATH
                 )

cmake/packaging/windows/generate_binaries.sh

@@ -5,6 +5,18 @@
 # Install this cross-compiler toolchain:
 #sudo apt-get install mingw-w64
 
+# x86_64
+mkdir build-mingw-64
+cd build-mingw-64
+cmake -DCMAKE_SYSTEM_NAME=Windows \
+      -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
+      -DCMAKE_TOOLCHAIN_FILE=./../cmake/modules/set_toolchain.cmake ..
+make package
+cp dist/*.zip ../build/Release/dist
+make clean
+cd ..
+rm -rf build-mingw-64
+
 # i686
 mkdir build-mingw-32
 cd build-mingw-32
@@ -16,15 +28,3 @@ cp dist/*.zip ../build/Release/dist
 make clean
 cd ..
 rm -rf build-mingw-32
-
-# x86_64
-# mkdir build-mingw-64
-# cd build-mingw-64
-# cmake -DCMAKE_SYSTEM_NAME=Windows \
-#       -DTOOLCHAIN_PREFIX=x86_64-w64-mingw32 \
-#       -DCMAKE_TOOLCHAIN_FILE=./../cmake/modules/set_toolchain.cmake ..
-# make package
-# cp dist/*.zip ../build/Release/dist
-# make clean
-# cd ..
-# rm -rf build-mingw-64