diff options
| author | cnlohr <lohr85@gmail.com> | 2016-12-20 23:39:58 -0500 |
|---|---|---|
| committer | cnlohr <lohr85@gmail.com> | 2016-12-20 23:39:58 -0500 |
| commit | 2bce90b5a5095c2327bbbba1d0cc4fdb38426ce0 (patch) | |
| tree | a3a955f85472f8888e2837eff821e2dc1f2219e8 /Makefile | |
| parent | 0fb1ec7b12f5c0dbe8e82d7d029e900751fc6c6a (diff) | |
| parent | 170219fe413602508b31c39df23c8938adc6c35f (diff) | |
| download | libsurvive-2bce90b5a5095c2327bbbba1d0cc4fdb38426ce0.tar.gz libsurvive-2bce90b5a5095c2327bbbba1d0cc4fdb38426ce0.tar.bz2 | |
Merge branch 'jpicht-disambiguate'
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 -CFLAGS:=-Iinclude -fPIC -g -Os -Iredist -flto +CFLAGS:=-Iinclude -fPIC -g -Os -Iredist -flto -DUSE_OLD_DISAMBIGUATOR LDFLAGS:=-lpthread -lusb-1.0 -lz -lX11 -flto test : test.c lib/libsurvive.so redist/os_generic.o @@ -12,7 +12,7 @@ data_recorder : data_recorder.c lib/libsurvive.so redist/os_generic.o redist/Dra lib: mkdir lib -lib/libsurvive.so : src/survive.o src/survive_usb.o src/survive_data.o src/survive_process.o redist/jsmn.o $(DEBUGSTUFF) +lib/libsurvive.so : src/survive.o src/survive_usb.o src/survive_data.o src/survive_process.o src/disambiguator.c redist/jsmn.o $(DEBUGSTUFF) gcc -o $@ $^ $(LDFLAGS) -shared clean : |