diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2013-05-17 19:34:14 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2013-05-17 19:34:14 +0200 |
| commit | 3a6f221c0a57f4b51f6135f23e4b124df4cdf4ce (patch) | |
| tree | 9842955843f482d15ce8009e5ca25e421f7e08a0 /drumgizmo | |
| parent | e0372cfee7cb9cc4fe95d605854a02b4feed28c2 (diff) | |
| parent | 87370e2852b4dc3c6b32d4d82aa14f76648b19d3 (diff) | |
Fix merge conflict.
Diffstat (limited to 'drumgizmo')
| -rw-r--r-- | drumgizmo/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drumgizmo/Makefile.am b/drumgizmo/Makefile.am index 26aea90..aaef1ee 100644 --- a/drumgizmo/Makefile.am +++ b/drumgizmo/Makefile.am @@ -2,7 +2,7 @@ DISTDIRS = input output if ENABLE_CLI -include $(top_srcdir)/src/Makefile.am.drumgizmo +include $(top_srcdir)/src/Makefile.am.drumgizmo SUBDIRS = input output @@ -11,8 +11,8 @@ bin_PROGRAMS = drumgizmo drumgizmo_LDADD = $(DRUMGIZMO_LIBS) $(PTHREAD_LIBS) -ldl $(JACK_LIBS) drumgizmo_CXXFLAGS = $(SNDFILE_CXXFLAGS) $(PTHREAD_CFLAGS) $(EXPAT_CFLAGS) \ - -I$(top_srcdir)/include -I$(top_srcdir)/src -DSSE -msse -msse2 -msse3 \ - -I$(top_srcdir)/hugin -DWITH_HUG_MUTEX $(JACK_CFLAGS) + -I$(top_srcdir)/include -I$(top_srcdir)/src \ + -I$(top_srcdir)/hugin -DWITH_HUG_MUTEX $(JACK_CFLAGS) $(SSEFLAGS) drumgizmo_SOURCES = \ audioinputenginedl.cc \ @@ -27,4 +27,4 @@ EXTRA_DIST = \ audiooutputenginedl.h \ jackclient.h -endif
\ No newline at end of file +endif |