@@ -33,64 +33,15 @@ cd objdir
3333PREFIX=` pwd`
3434cd -
3535
36- if [[ ` uname -s` == CYGWIN* || ` uname -s` == MINGW* ]]
37- then
38- cd tmp/libusb-win32-bin*
39- LIBUSB_DIR=` pwd`
40- cd ../..
41-
42- CFLAGS=" $CFLAGS -I$LIBUSB_DIR /include -L$LIBUSB_DIR /lib/gcc"
43- CXXFLAGS=" $CXXFLAGS -I$LIBUSB_DIR /include -L$LIBUSB_DIR /lib/gcc"
44- LDFLAGS=" $LDFLAGS -I$LIBUSB_DIR /include -L$LIBUSB_DIR /lib/gcc"
45- fi
46-
47- if [ ` uname -s` == " Linux" ] || [ ` uname -s` == " Darwin" ]
48- then
49- CFLAGS=" $CFLAGS -I$PREFIX /include -I$PREFIX /include/libusb-1.0/ -L$PREFIX /lib"
50- CXXFLAGS=" $CXXFLAGS -I$PREFIX /include -I$PREFIX /include/libusb-1.0/ -L$PREFIX /lib"
51- LDFLAGS=" $LDFLAGS -I$PREFIX /include -I$PREFIX /include -L$PREFIX /lib"
52- fi
36+ CFLAGS=" $CFLAGS -I$PREFIX /include -I$PREFIX /include/libusb-1.0/ -L$PREFIX /lib"
37+ CXXFLAGS=" $CXXFLAGS -I$PREFIX /include -I$PREFIX /include/libusb-1.0/ -L$PREFIX /lib"
38+ LDFLAGS=" $LDFLAGS -I$PREFIX /include -I$PREFIX /include -L$PREFIX /lib"
5339
5440mkdir -p avrdude-build
5541cd avrdude-build
56-
57- CONFARGS=" \
58- --prefix=$PREFIX \
59- --enable-linuxgpio"
60-
61- if [[ ` uname -s` != CYGWIN* && ` uname -s` != MINGW* ]]
62- then
63- CONFARGS=" $CONFARGS \
64- --enable-arduinotre"
65- fi
66-
67- CFLAGS=" -w -O2 $CFLAGS " CXXFLAGS=" -w -O2 $CXXFLAGS " LDFLAGS=" -s $LDFLAGS " ../avrdude-6.3/configure $CONFARGS > avrdude.configure.output
68-
69- cat avrdude.configure.output
70- DOESNTHAVELIBUSB=" DON'T HAVE libusb"
71- DOESNTHAVELIBUSB1=" DON'T HAVE libusb_1_0"
72- CHECKLIBUSB=` grep " DON'T HAVE libusb" avrdude.configure.output || echo`
73- CHECKLIBUSB1=` grep " DON'T HAVE libusb_1_0" avrdude.configure.output || echo`
74- rm avrdude.configure.output
75-
76- if [[ ` uname -s` == CYGWIN* || ` uname -s` == MINGW* ]]; then
77- if [[ " $CHECKLIBUSB " == " $DOESNTHAVELIBUSB " && " $CHECKLIBUSB1 " == " $DOESNTHAVELIBUSB1 " ]]; then
78- echo " avrdude missing libusb support"
79- exit 1
80- fi
81- else
82- if [[ " $CHECKLIBUSB " == " $DOESNTHAVELIBUSB " || " $CHECKLIBUSB1 " == " $DOESNTHAVELIBUSB1 " ]]; then
83- echo " avrdude missing libusb support"
84- exit 1
85- fi
86- fi
87-
88- if [ -z " $MAKE_JOBS " ]; then
89- MAKE_JOBS=" 2"
90- fi
91-
92- nice -n 10 make -j $MAKE_JOBS
93-
42+ CONFARGS=" --prefix=$PREFIX --enable-linuxgpio"
43+ CFLAGS=" -w -O2 $CFLAGS " CXXFLAGS=" -w -O2 $CXXFLAGS " LDFLAGS=" -s $LDFLAGS " ../avrdude-6.3/configure $CONFARGS
44+ make
9445make install
9546
9647if [ ` uname -s` == " Linux" ] || [ ` uname -s` == " Darwin" ]
0 commit comments