| リビジョン | 6f26a93d42a5cdfb10d5691e7a3e414206a38c67 (tree) |
|---|---|
| 日時 | 2014-03-03 09:54:43 |
| 作者 | naruko <naruko@24ea...> |
| コミッター | naruko |
libusb-win32 のヘッダファイルを変更
git-svn-id: svn+ssh://svn.osdn.net/svnroot/unagi@413 24ea1065-a21e-4ca1-99c9-f5125deb0858
client/trunk/anago/Makefile.windows (diff)
client/trunk/reader_kazzo.c (diff)
client/trunk/usb_device.h (diff)| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | APP_CUI = anago.exe |
| 2 | 2 | APP_GUI = anago_wx.exe |
| 3 | -LIBUSB = d:/dev/LibUSB-Win32 | |
| 3 | +LIBUSB = ../libusb-win32-bin-1.2.6.0 | |
| 4 | 4 | SQUIRREL = ../SQUIRREL224 |
| 5 | 5 | KAZZO = ../../kazzo/include |
| 6 | 6 | WX_CONFIG = /d/dev/wxWidgets/build_unicode_sound3/wx-config |
| @@ -1,7 +1,11 @@ | ||
| 1 | 1 | #include <assert.h> |
| 2 | 2 | #include <string.h> |
| 3 | 3 | #include <stdlib.h> |
| 4 | +#ifdef WIN32 | |
| 5 | +#include <lusb0_usb.h> | |
| 6 | +#else | |
| 4 | 7 | #include <usb.h> |
| 8 | +#endif | |
| 5 | 9 | #include <kazzo_request.h> |
| 6 | 10 | #include <kazzo_task.h> |
| 7 | 11 | #include "type.h" |
| @@ -23,7 +23,11 @@ files according to the GNU General Public License (GPL) version 2 or 3. | ||
| 23 | 23 | #ifndef __OPENDEVICE_H_INCLUDED__ |
| 24 | 24 | #define __OPENDEVICE_H_INCLUDED__ |
| 25 | 25 | |
| 26 | -#include <usb.h> /* this is libusb, see http://libusb.sourceforge.net/ */ | |
| 26 | +#ifdef WIN32 | |
| 27 | +#include <lusb0_usb.h> | |
| 28 | +#else | |
| 29 | +#include <usb.h> | |
| 30 | +#endif | |
| 27 | 31 | #include <stdio.h> |
| 28 | 32 | |
| 29 | 33 | int usbGetStringAscii(usb_dev_handle *dev, int index, char *buf, int buflen); |
Fork