Skip to content

Commit 08cd49e

Browse files
authored
Merge pull request #8 from arduino/remove-libusb-win32
Remove libusb-win32 and bump ncurses
2 parents f1e2bb9 + 4bad24c commit 08cd49e

File tree

1,851 files changed

+355518
-291644
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,851 files changed

+355518
-291644
lines changed

deps/build_libs.sh

Lines changed: 13 additions & 24 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
@@ -76,12 +65,12 @@ echo "*****************"
7665

7766
export CPPFLAGS="-P"
7867

79-
cd /opt/lib/ncurses-5.9
68+
cd /opt/lib/ncurses-6.3
8069
export NCURSES_DIR=`pwd`
8170

82-
./configure $EXTRAFLAGS --disable-shared --without-debug --without-ada --with-termlib --enable-termcap --without-manpages --without-progs --without-tests --host=$CROSS_COMPILE --prefix=${PREFIX}
71+
./configure $EXTRAFLAGS --target=$CROSS_COMPILE --without-pthread --enable-database --enable-sp-funcs --enable-term-driver --without-shared --without-debug --without-ada --enable-termcap --without-manpages --without-progs --without-tests --host=$CROSS_COMPILE --prefix=${PREFIX}
8372
make distclean
84-
./configure $EXTRAFLAGS --disable-shared --without-debug --without-ada --with-termlib --enable-termcap --without-manpages --without-progs --without-tests --host=$CROSS_COMPILE --prefix=${PREFIX}
73+
./configure $EXTRAFLAGS --target=$CROSS_COMPILE --without-pthread --enable-database --enable-sp-funcs --enable-term-driver --without-shared --without-debug --without-ada --enable-termcap --without-manpages --without-progs --without-tests --host=$CROSS_COMPILE --prefix=${PREFIX}
8574
make -j$(nproc)
8675
make install.libs
8776

deps/ncurses-5.9/ANNOUNCE

Lines changed: 0 additions & 288 deletions
This file was deleted.

0 commit comments

Comments
 (0)