diff options
| author | jdavidberger <j.david.berger@gmail.com> | 2018-06-26 23:28:56 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-26 23:28:56 -0600 |
| commit | dc24a0502b8336a59571a7b3ce33580998459f78 (patch) | |
| tree | bae72f9ebe6937dbbabb7beec3115028a15743b0 /Makefile | |
| parent | e68b69a9a14aeb70988c52666e60502fe6f049ab (diff) | |
| parent | cf36bd58b8c9d1c23ccfe1a52beafe376ba02e6b (diff) | |
| download | libsurvive-dc24a0502b8336a59571a7b3ce33580998459f78.tar.gz libsurvive-dc24a0502b8336a59571a7b3ce33580998459f78.tar.bz2 | |
Merge pull request #135 from rapyuta-robotics/fix_wired_tracker
fixed Makefile for LINUX_USE_HIDAPI, updated tracker usb pid, fixed w…
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -57,18 +57,19 @@ else # Linux / FreeBSD GRAPHICS_LOFI:=redist/CNFGFunctions.c redist/CNFGXDriver.c endif +ifdef LINUX_USE_HIDAPI + CFLAGS:=$(CFLAGS) -DHIDAPI + #TODO why doesn't the redist version work + #REDISTS:=$(REDISTS) redist/hid-linux.c + LDFLAGS:=$(LDFLAGS) -ludev -lhidapi-libusb +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) |