diff options
author | Justin Berger <j.david.berger@gmail.com> | 2018-04-03 23:44:14 -0600 |
---|---|---|
committer | Justin Berger <j.david.berger@gmail.com> | 2018-04-03 23:44:14 -0600 |
commit | c7d9d271796b20f886e2441de852498ecb25ca82 (patch) | |
tree | 5929c2793c33c80e5392982a9baaa8d5ccaca724 /Makefile | |
parent | fe025b0ff6bfb440da7cec8f388fa951910a86f0 (diff) | |
parent | 6a45298c9bc34aac59cc2ebb9de2d82c7a42756e (diff) | |
download | libsurvive-c7d9d271796b20f886e2441de852498ecb25ca82.tar.gz libsurvive-c7d9d271796b20f886e2441de852498ecb25ca82.tar.bz2 |
Merge branch 'master' into imu
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -40,7 +40,7 @@ ifeq ($(UNAME), Darwin) REDISTS:=$(REDISTS) redist/hid-osx.c endif -LIBSURVIVE_CORE:=src/survive.o src/survive_usb.o src/survive_charlesbiguator.o src/survive_process.o src/ootx_decoder.o src/survive_driverman.o src/survive_default_devices.o src/survive_vive.o src/survive_playback.o src/survive_config.o src/survive_cal.o src/survive_reproject.o src/poser.o src/epnp/epnp.o src/survive_sensor_activations.o src/survive_turveybiguator.o src/survive_disambiguator.o src/survive_statebased_disambiguator.o src/survive_imu.o src/poser_imu.o +LIBSURVIVE_CORE:=src/survive.o src/survive_usb.o src/survive_charlesbiguator.o src/survive_process.o src/ootx_decoder.o src/survive_driverman.o src/survive_default_devices.o src/survive_vive.o src/survive_playback.o src/survive_config.o src/survive_cal.o src/survive_reproject.o src/poser.o src/epnp/epnp.o src/survive_sensor_activations.o src/survive_turveybiguator.o src/survive_disambiguator.o src/survive_statebased_disambiguator.o src/poser_charlesrefine.o src/survive_imu.o src/poser_imu.o #If you want to use HIDAPI on Linux. #CFLAGS:=$(CFLAGS) -DHIDAPI |