diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-09-13 23:22:12 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-09-13 23:22:12 +0000 |
| commit | 1cad159b52a49d14027b23676da5d73fb5142b9d (patch) | |
| tree | 5cc4f8ff6efac68c70198e8690f6376d3c1d00a6 | |
| parent | 246b7b648787d8aa5747044f4365143ae4b7da46 (diff) | |
fixed up build system and includes to get [hidin] building as part of Pd-extended on Windows
svn path=/trunk/externals/olafmatt/; revision=5930
| -rw-r--r-- | hidin/hidin.c | 3 | ||||
| -rw-r--r-- | hidin/hidin.h | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/hidin/hidin.c b/hidin/hidin.c index a41c563..fe9a79c 100644 --- a/hidin/hidin.c +++ b/hidin/hidin.c @@ -40,7 +40,7 @@ typedef struct _hidin long *x_prev_data; /* data we read the time bofore */
void *x_qelem; /* qelem for outputing the results */
long x_device; /* the HID device number we're connecting to */
- short x_elements; /* number of elements (i.e. buttons, axes...)
+ short x_elements; /* number of elements (i.e. buttons, axes...)*/
/* HID specific */
t_hid_device *x_hid; /* a struct containing all the needed stuff about the HID device */
@@ -741,7 +741,6 @@ void hidin_setup(void) class_addmethod(hidin_class, (t_method)hidin_open, gensym("open"), A_FLOAT, 0);
class_addmethod(hidin_class, (t_method)hidin_close, gensym("close"), 0);
class_addmethod(hidin_class, (t_method)hidin_interval, gensym("interval"), A_FLOAT, 0);
- class_sethelpsymbol(hidin_class, gensym("help-hidin.pd"));
post(hidin_version);
}
diff --git a/hidin/hidin.h b/hidin/hidin.h index 4425b76..5e88451 100644 --- a/hidin/hidin.h +++ b/hidin/hidin.h @@ -12,9 +12,13 @@ #include <stdlib.h>
#include <wtypes.h>
#include <setupapi.h>
+#ifdef _MSC_VER
#include "hidusage.h"
#include "hidsdi.h"
-#include "setupapi.h"
+#else
+#include <ddk/hidusage.h>
+#include <ddk/hidsdi.h>
+#endif
//
// A structure to hold the steady state data received from the hid device.
@@ -139,4 +143,4 @@ BOOLEAN unpackReport(PCHAR ReportBuffer, USHORT ReportBufferLength, HIDP_REPORT_ BOOLEAN packReport(PCHAR ReportBuffer, USHORT ReportBufferLength, HIDP_REPORT_TYPE ReportType,
t_hid_data *Data, ULONG DataLength, PHIDP_PREPARSED_DATA Ppd);
-#endif // hidin_H
\ No newline at end of file +#endif // hidin_H
|