From c1603243eeba3f7f9ff8f9f70098105c634166e5 Mon Sep 17 00:00:00 2001 From: WenZheng Li Date: Tue, 12 Jun 2018 23:33:01 +0900 Subject: fixed Makefile for LINUX_USE_HIDAPI, updated tracker usb pid, fixed wired tracker lightcap data callback --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index eb2177a..0d80dd0 100644 --- a/Makefile +++ b/Makefile @@ -57,18 +57,18 @@ else # Linux / FreeBSD GRAPHICS_LOFI:=redist/CNFGFunctions.c redist/CNFGXDriver.c endif +ifdef LINUX_USE_HIDAPI + CFLAGS:=$(CFLAGS) -DHIDAPI + REDISTS:=$(REDISTS) redist/hid-linux.c + LDFLAGS:=$(LDFLAGS) -ludev +endif + ifdef MINIMAL LIBSURVIVE_C:=$(REDISTS) $(LIBSURVIVE_CORE) $(MINIMAL_NEEDED) else LIBSURVIVE_C:=$(POSERS) $(REDISTS) $(LIBSURVIVE_CORE) $(SBA) $(MINIMAL_NEEDED) $(AUX_NEEDED) endif -ifdef LINUX_USE_HIDAPI - CFLAGS:=$(CFLAGS) -DHIDAPI - REDISTS:=$(REDISTS) redist/hid-linux.o - LDFLAGS:=$(LDFLAGS) -ludev -endif - #Actually make object and dependency lists. LIBSURVIVE_O:=$(LIBSURVIVE_C:%.c=$(OBJDIR)/%.o) -- cgit v1.2.3 From 65ccd71e7f44baa759e56f3f29b2a825ccebb5f6 Mon Sep 17 00:00:00 2001 From: WenZheng Li Date: Wed, 13 Jun 2018 22:35:34 +0900 Subject: changed to distro specific hidapi lib --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0d80dd0..0a16b32 100644 --- a/Makefile +++ b/Makefile @@ -59,8 +59,9 @@ endif ifdef LINUX_USE_HIDAPI CFLAGS:=$(CFLAGS) -DHIDAPI - REDISTS:=$(REDISTS) redist/hid-linux.c - LDFLAGS:=$(LDFLAGS) -ludev + #TODO why doesn't the redist version work + #REDISTS:=$(REDISTS) redist/hid-linux.c + LDFLAGS:=$(LDFLAGS) -ludev -lhidapi-libusb endif ifdef MINIMAL -- cgit v1.2.3