Skip to content

Commit 9a0c6df

Browse files
committed
remove libusb-win32 dep in favor of libusb-compat
1 parent f1e2bb9 commit 9a0c6df

File tree

1 file changed

+10
-21
lines changed

1 file changed

+10
-21
lines changed

deps/build_libs.sh

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,17 @@ make install
2222

2323
export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
2424

25-
if [[ $CROSS_COMPILE == "i686-w64-mingw32" ]] ; then
26-
# libusb-compat is a mess to compile for win32
27-
# use a precompiled version from libusb-win32 project
28-
curl http://download.sourceforge.net/project/libusb-win32/libusb-win32-releases/1.2.6.0/libusb-win32-bin-1.2.6.0.zip -o libusb-win32-bin-1.2.6.0.zip -L
29-
unzip libusb-win32-bin-1.2.6.0.zip
30-
#mkdir -p $PREFIX/bin/
31-
#cp libusb-win32-bin-1.2.6.0/bin/x86/libusb0_x86.dll $PREFIX/bin/libusb0.dll
32-
cp libusb-win32-bin-1.2.6.0/include/lusb0_usb.h $PREFIX/include
33-
cp libusb-win32-bin-1.2.6.0/lib/gcc/libusb.a $PREFIX/lib
34-
else
35-
if [[ $CROSS_COMPILE == "x86_64-apple-darwin13" ]]; then
36-
export LIBUSB_1_0_CFLAGS=-I${PREFIX}/include/libusb-1.0
37-
export LIBUSB_1_0_LIBS="-L${PREFIX}/lib -lusb-1.0"
38-
fi
39-
cd /opt/lib/libusb-compat-0.1.7
40-
export LIBUSB0_DIR=`pwd`
41-
PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ./configure --prefix=${PREFIX} --enable-static --disable-shared --host=${CROSS_COMPILE}
42-
make distclean
43-
PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ./configure --prefix=${PREFIX} --enable-static --disable-shared --host=${CROSS_COMPILE}
44-
make -j$(nproc)
45-
make install
25+
if [[ $CROSS_COMPILE == "x86_64-apple-darwin13" ]]; then
26+
export LIBUSB_1_0_CFLAGS=-I${PREFIX}/include/libusb-1.0
27+
export LIBUSB_1_0_LIBS="-L${PREFIX}/lib -lusb-1.0"
4628
fi
29+
cd /opt/lib/libusb-compat-0.1.7
30+
export LIBUSB0_DIR=`pwd`
31+
PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ./configure --prefix=${PREFIX} --enable-static --disable-shared --host=${CROSS_COMPILE}
32+
make distclean
33+
PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ./configure --prefix=${PREFIX} --enable-static --disable-shared --host=${CROSS_COMPILE}
34+
make -j$(nproc)
35+
make install
4736

4837
cd /opt/lib/libftdi1-1.4
4938
rm -rf build && mkdir build && cd build

0 commit comments

Comments
 (0)