diff options
| author | Joshua Allen <axlecrusher@gmail.com> | 2017-02-25 14:22:13 -0500 |
|---|---|---|
| committer | Joshua Allen <axlecrusher@gmail.com> | 2017-02-25 14:22:13 -0500 |
| commit | 021eb3fd655629b3d11b9923098689bf96c26890 (patch) | |
| tree | 679c0b92846518e29fe3376f0dd3840bd1db5d03 /Makefile | |
| parent | 4c4969d0cb0f817de2aa866a7d8abfde6ecaff82 (diff) | |
| parent | f92f5dc93cbb53a99da51984541a7e4a70605639 (diff) | |
| download | libsurvive-021eb3fd655629b3d11b9923098689bf96c26890.tar.gz libsurvive-021eb3fd655629b3d11b9923098689bf96c26890.tar.bz2 | |
Merge github.com:cnlohr/libsurvive
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,6 +1,6 @@ all : lib data_recorder test calibrate -CFLAGS:=-Iinclude -fPIC -g -O0 -Iredist -flto +CFLAGS:=-Iinclude -fPIC -g -O0 -Iredist -flto -DUSE_DOUBLE LDFLAGS:=-lpthread -lusb-1.0 -lz -lX11 -lm -flto -g @@ -20,7 +20,7 @@ calibrate : calibrate.c lib/libsurvive.so redist/os_generic.c redist/DrawFuncti 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 src/survive_config.o $(DEBUGSTUFF) $(CALS) +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_config.o $(DEBUGSTUFF) $(CALS) gcc -o $@ $^ $(LDFLAGS) -shared clean : |