GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-22 20:44:19 +00:00
Code Issues Releases Wiki Activity

Revert "Find libusb-1.0 with pkg-config except on mingw, and fix #include path"

Browse Source 
This reverts commit ce72dbea7d7405ed37456c89c8b0516188f57fc7.
This commit is contained in:
Con Kolivas 2012-11-25 09:47:26 +11:00
parent 30ade169ef
commit 8bc60506c5
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure.ac
View File

@ -343,24 +343,16 @@ if test "x$bitforce$modminer" != xnono; then
fi fi
AM_CONDITIONAL([HAVE_LIBUDEV], [test x$libudev != xno]) AM_CONDITIONAL([HAVE_LIBUDEV], [test x$libudev != xno])
PKG_PROG_PKG_CONFIG()
if test "x$ztex" != xno; then if test "x$ztex" != xno; then
case $target in AC_CHECK_LIB(usb-1.0, libusb_init, ,
*-*-mingw*) AC_MSG_ERROR([Could not find usb library - please install libusb]))
# workaround for libusbx windows binaries not including a .pc file AC_DEFINE([HAVE_LIBUSB], [1], [Defined to 1 if libusb is wanted])
LIBUSB_LIBS="-LC:/MinGW/lib -lusb-1.0" USB_LIBS="-lusb-1.0"
LIBUSB_CFLAGS="-IC:/MinGW/include/libusb-1.0" USB_FLAGS=""
AC_DEFINE(HAVE_LIBUSB, 1, [Define if you have libusb-1.0])
;;
*)
PKG_CHECK_MODULES(LIBUSB, libusb-1.0, [AC_DEFINE(HAVE_LIBUSB, 1, [Define if you have libusb-1.0])], [AC_MSG_ERROR([Could not find usb library - please install libusb-1.0])])
;;
esac
USB_LIBS="$LIBUSB_LIBS"
USB_FLAGS="$LIBUSB_CFLAGS"
fi fi
PKG_PROG_PKG_CONFIG()
PKG_CHECK_MODULES([LIBCURL], [libcurl >= 7.18.2], ,[AC_MSG_ERROR([Missing required libcurl dev >= 7.18.2])]) PKG_CHECK_MODULES([LIBCURL], [libcurl >= 7.18.2], ,[AC_MSG_ERROR([Missing required libcurl dev >= 7.18.2])])
AC_SUBST(LIBCURL_LIBS) AC_SUBST(LIBCURL_LIBS)

2
libztex.h
View File

@ -22,7 +22,7 @@
#ifndef __LIBZTEX_H__ #ifndef __LIBZTEX_H__
#define __LIBZTEX_H__ #define __LIBZTEX_H__
#include <libusb.h> #include <libusb-1.0/libusb.h>
#define LIBZTEX_MAX_DESCRIPTORS 512 #define LIBZTEX_MAX_DESCRIPTORS 512
#define LIBZTEX_SNSTRING_LEN 10 #define LIBZTEX_SNSTRING_LEN 10

2
miner.h
View File

@ -103,7 +103,7 @@ static inline int fsync (int fd)
#endif #endif
#ifdef HAVE_LIBUSB #ifdef HAVE_LIBUSB
#include <libusb.h> #include <libusb-1.0/libusb.h>
#endif #endif
#ifdef USE_ZTEX #ifdef USE_ZTEX