diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-02-26 11:51:50 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-02-26 11:51:50 +0100 |
| commit | d2407fea1ed7c3c718a4c115d8c632664c2378dd (patch) | |
| tree | 9f0d21c77d64da4e9be1f4b0ba99f54edc691ad5 /build/linux/Makefile.in | |
| parent | 3cae1d138c53a3fd042de3d2c9d9a07cf0650e0f (diff) | |
| parent | 0ca00f4c671d6d583ae77838d3e0d4fcd411f077 (diff) | |
| download | astra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.tar.gz astra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.tar.bz2 astra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.tar.xz astra-d2407fea1ed7c3c718a4c115d8c632664c2378dd.zip | |
Merge branch 'master' into python-interface
Diffstat (limited to 'build/linux/Makefile.in')
| -rw-r--r-- | build/linux/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index fe1ba91..6620446 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -25,10 +25,11 @@ VPATH=../.. CPPFLAGS=@SAVED_CPPFLAGS@ CXXFLAGS=@SAVED_CXXFLAGS@ LDFLAGS=@SAVED_LDFLAGS@ +LIBS=@SAVED_LIBS@ CPPFLAGS+=-I../.. -I../../include -I../../lib/include/rapidxml CXXFLAGS+=-g -O3 -Wall -Wshadow -LIBS=-lpthread -lrt +LIBS+=-lpthread LDFLAGS+=-g ifeq ($(cuda),yes) |