diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2002-09-29 03:41:37 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2002-09-29 03:41:37 +0000 |
| commit | 510b91e1dc495d45f047469a685392a968c8c3e6 (patch) | |
| tree | a580af3758be9f213c54a7934037051c20eec15a /emulators/snes9x | |
| parent | Forced commit. The last commit should have read that kris tested this on (diff) | |
Fix build (chase libusb to libusbhid)
Notes
Notes:
svn path=/head/; revision=67210
Diffstat (limited to 'emulators/snes9x')
| -rw-r--r-- | emulators/snes9x/Makefile | 2 | ||||
| -rw-r--r-- | emulators/snes9x/files/patch-aa | 6 | ||||
| -rw-r--r-- | emulators/snes9x/files/patch-af | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile index 7d99994f83a0..ec3c158bbafa 100644 --- a/emulators/snes9x/Makefile +++ b/emulators/snes9x/Makefile @@ -27,7 +27,7 @@ MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" \ USE_ZIP= YES WRKSRC= ${WRKDIR}/release -.if exists(/usr/lib/libusb.a) +.if exists(/usr/lib/libusbhid.a) MAKE_ENV+= USB_JOYSTICK_SUPPORT=yes .endif diff --git a/emulators/snes9x/files/patch-aa b/emulators/snes9x/files/patch-aa index 0fb8a334afe4..b86fedec824e 100644 --- a/emulators/snes9x/files/patch-aa +++ b/emulators/snes9x/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Wed Feb 28 15:29:58 2001 -+++ Makefile Sat Mar 24 23:16:22 2001 +--- Makefile.orig Wed Feb 28 12:29:58 2001 ++++ Makefile Sat Sep 28 20:50:19 2002 @@ -4,7 +4,6 @@ #SPC700ASM=1 NETPLAY=1 @@ -51,7 +51,7 @@ +ifdef USB_JOYSTICK_SUPPORT +CCFLAGS += -DJOYSTICK_SUPPORT -+EXTRALIBS += -lusb ++EXTRALIBS += -lusbhid +endif + #-DSOUND diff --git a/emulators/snes9x/files/patch-af b/emulators/snes9x/files/patch-af index 3b4bb724326c..c80a45a0ad5f 100644 --- a/emulators/snes9x/files/patch-af +++ b/emulators/snes9x/files/patch-af @@ -1,5 +1,5 @@ ---- unix/unix.cpp.orig Wed Feb 28 16:12:23 2001 -+++ unix/unix.cpp Fri Sep 20 14:58:01 2002 +--- unix/unix.cpp.orig Wed Feb 28 13:12:23 2001 ++++ unix/unix.cpp Sat Sep 28 20:16:36 2002 @@ -51,9 +51,11 @@ #include <ctype.h> @@ -63,7 +63,7 @@ +#include <dev/usb/usbhid.h> +#undef class + -+#include <libusb.h> ++#include <libusbhid.h> +} + +#define JOYSTICK_MAX_BUTTONS 16 |