Skip to content

Commit 43581af

Browse files
committed
Use libusb-win32 for libusb0.1 compatibility on win32
1 parent 3706615 commit 43581af

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

libusb-compat-0.1.5.build.bash

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,21 @@ cd objdir
2020
PREFIX=`pwd`
2121
cd -
2222

23-
if [[ ! -f libusb-compat-0.1.5.tar.bz2 ]] ;
24-
then
25-
wget http://download.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-0.1.5/libusb-compat-0.1.5.tar.bz2
23+
if [[ $OS == "Msys" || $OS == "Cygwin" || $CROSS_COMPILE_HOST == "i686-w64-mingw32" ]] ; then
24+
# libusb-compat is a mess to compile for win32
25+
# use a precompiled version from libusb-win32 project
26+
if [[ ! -f libusb-win32-bin-1.2.6.0.zip ]] ; then
27+
wget http://download.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip
28+
fi
29+
unzip libusb-win32-bin-1.2.6.0.zip
30+
cp libusb-win32-bin-1.2.6.0/bin/x86/libusb0_x86.dll $PREFIX/bin/libusb0.dll
31+
cp libusb-win32-bin-1.2.6.0/include/lusb0_usb.h $PREFIX/include
32+
cp libusb-win32-bin-1.2.6.0/lib/gcc/libusb.a $PREFIX/lib
33+
exit 0
34+
fi
35+
36+
if [[ ! -f libusb-compat-0.1.5.tar.bz2 ]] ; then
37+
wget http://download.sourceforge.net/project/libusb/libusb-compat-0.1/libusb-compat-0.1.5/libusb-compat-0.1.5.tar.bz2
2638
fi
2739

2840
tar xfv libusb-compat-0.1.5.tar.bz2

package-avrdude.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ else
6363

6464
fi
6565

66-
rm -rf avrdude-6.3 libusb-1.0.20 libusb-compat-0.1.5 libelf-0.8.13 objdir
66+
rm -rf avrdude-6.3 libusb-1.0.20 libusb-compat-0.1.5 libusb-win32-bin-1.2.6.0 libelf-0.8.13 objdir
6767

6868
./libusb-1.0.20.build.bash
6969
./libusb-compat-0.1.5.build.bash

0 commit comments

Comments
 (0)