libusb-win32 のヘッダファイルを変更

git-svn-id: svn+ssh://svn.osdn.net/svnroot/unagi@413 24ea1065-a21e-4ca1-99c9-f5125deb0858

diff --git a/client/trunk/anago/Makefile.windows b/client/trunk/anago/Makefile.windows
index 104b72b..ebc3770 100644 (file)
--- a/client/trunk/anago/Makefile.windows
+++ b/client/trunk/anago/Makefile.windows
@@ -1,6 +1,6 @@
 APP_CUI = anago.exe\r
 APP_GUI = anago_wx.exe\r
-LIBUSB = d:/dev/LibUSB-Win32\r
+LIBUSB = ../libusb-win32-bin-1.2.6.0\r
 SQUIRREL = ../SQUIRREL224\r
 KAZZO = ../../kazzo/include\r
 WX_CONFIG = /d/dev/wxWidgets/build_unicode_sound3/wx-config\r

diff --git a/client/trunk/reader_kazzo.c b/client/trunk/reader_kazzo.c
index de68808..0171254 100644 (file)
--- a/client/trunk/reader_kazzo.c
+++ b/client/trunk/reader_kazzo.c
@@ -1,7 +1,11 @@
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
+#ifdef WIN32
+#include <lusb0_usb.h>
+#else
 #include <usb.h>
+#endif
 #include <kazzo_request.h>
 #include <kazzo_task.h>
 #include "type.h"

diff --git a/client/trunk/usb_device.h b/client/trunk/usb_device.h
index 79c12f6..369a744 100644 (file)
--- a/client/trunk/usb_device.h
+++ b/client/trunk/usb_device.h
@@ -23,7 +23,11 @@ files according to the GNU General Public License (GPL) version 2 or 3.
 #ifndef __OPENDEVICE_H_INCLUDED__
 #define __OPENDEVICE_H_INCLUDED__
 
-#include <usb.h>    /* this is libusb, see http://libusb.sourceforge.net/ */
+#ifdef WIN32
+#include <lusb0_usb.h>
+#else
+#include <usb.h>
+#endif
 #include <stdio.h>
 
 int usbGetStringAscii(usb_dev_handle *dev, int index, char *buf, int buflen);