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 /lv2 | |
| parent | e0372cfee7cb9cc4fe95d605854a02b4feed28c2 (diff) | |
| parent | 87370e2852b4dc3c6b32d4d82aa14f76648b19d3 (diff) | |
Fix merge conflict.
Diffstat (limited to 'lv2')
| -rw-r--r-- | lv2/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lv2/Makefile.am b/lv2/Makefile.am index b562bb1..ff543b6 100644 --- a/lv2/Makefile.am +++ b/lv2/Makefile.am @@ -6,7 +6,7 @@ include $(top_srcdir)/src/Makefile.am.drumgizmo AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/plugingui \ -I$(top_srcdir)/include $(SNDFILE_CXXFLAGS) \ $(PTHREAD_CFLAGS) $(EXPAT_CFLAGS) $(LV2_CFLAGS) \ - $(PLUGIN_GUI_CFLAGS) -DX11 -DSSE -msse -msse2 -msse3 \ + $(PLUGIN_GUI_CFLAGS) -DX11 $(SSEFLAGS)\ -DUSE_THREAD plugindir = $(prefix)/lib/lv2/drumgizmo.lv2 |