changes to build on windows / cygwin

This commit is contained in:
U-CERVELO\ttsou 2009-09-11 15:35:28 -04:00 committed by ttsou
parent 11cd404891
commit fda94fd822
7 changed files with 18 additions and 15 deletions

View File

@ -74,7 +74,10 @@ darwin_CODE = \
win32_CODE = \
fusb_win32.cc \
fusb_sysconfig_win32.cc
fusb_sysconfig_win32.cc \
usrp_prims_libusb.cc \
usrp_basic_libusb.cc
linux_CODE = \
fusb_linux.cc \

View File

@ -20,9 +20,9 @@
* Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
//#ifdef HAVE_CONFIG_H
//#include "config.h"
//#endif
#include <fusb.h>

View File

@ -65,7 +65,7 @@ public:
int block_size = 0, int nblocks = 0) = 0;
// ACCESSORS
libusb_device_handle *get_libusb_device_handle () const { return d_udh; }
libusb_device_handle *get_usb_dev_handle () const { return d_udh; }
};

View File

@ -27,7 +27,7 @@ static const int MAX_BLOCK_SIZE = 64 * 1024; // Windows kernel hard limit
static const int FUSB_BUFFER_SIZE = 2 * (1L << 20); // 2 MB
fusb_devhandle *
fusb_sysconfig::make_devhandle (usb_dev_handle *udh)
fusb_sysconfig::make_devhandle (usb_dev_handle *udh, libusb_context *ctx)
{
return new fusb_devhandle_win32 (udh);
}

View File

@ -20,9 +20,9 @@
* Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
//#ifdef HAVE_CONFIG_H
//#include "config.h"
//#endif
#include <fusb_win32.h>
#include <usb.h>

View File

@ -20,9 +20,9 @@
* Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
//#ifdef HAVE_CONFIG_H
//#include "config.h"
//#endif
#include "usrp/usrp_basic.h"
#include "usrp/usrp_prims.h"

View File

@ -20,9 +20,9 @@
* Boston, MA 02110-1301, USA.
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
//#ifdef HAVE_CONFIG_H
//#include "config.h"
//#endif
#include <usrp/usrp_basic.h>
#include "usrp/usrp_prims.h"