diff options
| author | Mike Turvey <mturvey6@gmail.com> | 2017-03-11 09:00:58 -0700 |
|---|---|---|
| committer | Mike Turvey <mturvey6@gmail.com> | 2017-03-11 09:00:58 -0700 |
| commit | ba38ddcc4c3d74c00139ceff9b45481259d80fc7 (patch) | |
| tree | ba1efc8aa8f7a76aa9f9f831aff16ea86fdc2b23 /Makefile | |
| parent | 1d9db12d7e115f2b8994f014e37f1086c17e90fd (diff) | |
| parent | cdc60d110a9cd69c5bd8c0ac4e67db1ce7cecc93 (diff) | |
| download | libsurvive-ba38ddcc4c3d74c00139ceff9b45481259d80fc7.tar.gz libsurvive-ba38ddcc4c3d74c00139ceff9b45481259d80fc7.tar.bz2 | |
Merge remote-tracking branch 'remotes/upstream/master' into Octavios_Algorithm
Conflicts:
redist/linmath.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
@@ -3,27 +3,32 @@ all : lib data_recorder test calibrate calibrate_client CFLAGS:=-Iinclude/libsurvive -I. -fPIC -g -O0 -Iredist -flto -DUSE_DOUBLE -std=gnu99 LDFLAGS:=-lpthread -lusb-1.0 -lz -lX11 -lm -flto -g - CALS:=src/survive_cal_lhfind.o src/survive_cal.o +POSERS:=src/poser_dummy.o +REDISTS:=redist/json_helpers.o redist/linmath.o redist/jsmn.o +LIBSURVIVE_CORE:=src/survive.o src/survive_usb.o src/survive_data.o src/survive_process.o src/ootx_decoder.o src/survive_driverman.o src/survive_vive.o src/survive_config.o +LIBSURVIVE_O:=$(CALS) $(POSERS) $(REDISTS) $(LIBSURVIVE_CORE) + +GRAPHICS_LOFI:=redist/DrawFunctions.o redist/XDriver.o # unused: redist/crc32.c test : test.c lib/libsurvive.so redist/os_generic.o gcc -o $@ $^ $(LDFLAGS) $(CFLAGS) -data_recorder : data_recorder.c lib/libsurvive.so redist/os_generic.o redist/DrawFunctions.o redist/XDriver.o +data_recorder : data_recorder.c lib/libsurvive.so redist/os_generic.c $(GRAPHICS_LOFI) gcc -o $@ $^ $(LDFLAGS) $(CFLAGS) -calibrate : calibrate.c lib/libsurvive.so redist/os_generic.c redist/DrawFunctions.c redist/XDriver.c +calibrate : calibrate.c lib/libsurvive.so redist/os_generic.c $(GRAPHICS_LOFI) gcc -o $@ $^ $(LDFLAGS) $(CFLAGS) -calibrate_client : calibrate_client.c lib/libsurvive.so redist/os_generic.c redist/DrawFunctions.c redist/XDriver.c +calibrate_client : calibrate_client.c lib/libsurvive.so redist/os_generic.c $(GRAPHICS_LOFI) gcc -o $@ $^ $(LDFLAGS) $(CFLAGS) lib: mkdir lib -lib/libsurvive.so : src/survive.o src/survive_usb.o src/survive_data.o src/survive_process.o redist/jsmn.o src/ootx_decoder.o redist/linmath.o src/survive_driverman.o src/survive_vive.o src/survive_config.o redist/json_helpers.o src/PoserDummy.o $(DEBUGSTUFF) $(CALS) +lib/libsurvive.so : $(LIBSURVIVE_O) gcc -o $@ $^ $(LDFLAGS) -shared clean : |