コミットメタ情報

リビジョン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

変更サマリ

差分

--- a/client/trunk/anago/Makefile.windows
+++ b/client/trunk/anago/Makefile.windows
@@ -1,6 +1,6 @@
11 APP_CUI = anago.exe
22 APP_GUI = anago_wx.exe
3-LIBUSB = d:/dev/LibUSB-Win32
3+LIBUSB = ../libusb-win32-bin-1.2.6.0
44 SQUIRREL = ../SQUIRREL224
55 KAZZO = ../../kazzo/include
66 WX_CONFIG = /d/dev/wxWidgets/build_unicode_sound3/wx-config
--- a/client/trunk/reader_kazzo.c
+++ b/client/trunk/reader_kazzo.c
@@ -1,7 +1,11 @@
11 #include <assert.h>
22 #include <string.h>
33 #include <stdlib.h>
4+#ifdef WIN32
5+#include <lusb0_usb.h>
6+#else
47 #include <usb.h>
8+#endif
59 #include <kazzo_request.h>
610 #include <kazzo_task.h>
711 #include "type.h"
--- 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.
2323 #ifndef __OPENDEVICE_H_INCLUDED__
2424 #define __OPENDEVICE_H_INCLUDED__
2525
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
2731 #include <stdio.h>
2832
2933 int usbGetStringAscii(usb_dev_handle *dev, int index, char *buf, int buflen);
旧リポジトリブラウザで表示