From 0d286eef9634116828ead278f9534f04ecbb6ecd Mon Sep 17 00:00:00 2001 From: cnlohr Date: Sat, 11 Mar 2017 16:36:28 -0500 Subject: Update a few files... need to get working with linmath. But first switching accounts. --- Makefile | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1a1712d..ec5d39b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ all : lib data_recorder test calibrate calibrate_client +CC:=gcc + CFLAGS:=-Iinclude/libsurvive -I. -fPIC -g -O0 -Iredist -flto -DUSE_DOUBLE -std=gnu99 LDFLAGS:=-lpthread -lusb-1.0 -lz -lX11 -lm -flto -g @@ -8,28 +10,33 @@ 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) +LIBSURVIVE_C:=$(LIBSURVIVE_O:.o=.c) 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) +test : test.c ./lib/libsurvive.so redist/os_generic.o + $(CC) -o $@ $^ $(LDFLAGS) $(CFLAGS) + +data_recorder : data_recorder.c ./lib/libsurvive.so redist/os_generic.c $(GRAPHICS_LOFI) + $(CC) -o $@ $^ $(LDFLAGS) $(CFLAGS) -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 $(GRAPHICS_LOFI) + $(CC) -o $@ $^ $(LDFLAGS) $(CFLAGS) -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 $(GRAPHICS_LOFI) + $(CC) -o $@ $^ $(LDFLAGS) $(CFLAGS) -calibrate_client : calibrate_client.c lib/libsurvive.so redist/os_generic.c $(GRAPHICS_LOFI) - gcc -o $@ $^ $(LDFLAGS) $(CFLAGS) +## Still not working!!! Don't use. +static_calibrate : calibrate.c redist/os_generic.c redist/XDriver.c redist/DrawFunctions.c $(LIBSURVIVE_C) + tcc -o $@ $^ $(CFLAGS) $(LDFLAGS) -DTCC lib: mkdir lib lib/libsurvive.so : $(LIBSURVIVE_O) - gcc -o $@ $^ $(LDFLAGS) -shared + $(CC) -o $@ $^ $(LDFLAGS) -shared clean : rm -rf *.o src/*.o *~ src/*~ test data_recorder lib/libsurvive.so redist/*.o redist/*~ -- cgit v1.2.3