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 | |
| parent | e0372cfee7cb9cc4fe95d605854a02b4feed28c2 (diff) | |
| parent | 87370e2852b4dc3c6b32d4d82aa14f76648b19d3 (diff) | |
Fix merge conflict.
| -rw-r--r-- | configure.in | 54 | ||||
| -rw-r--r-- | drumgizmo/Makefile.am | 8 | ||||
| -rw-r--r-- | lv2/Makefile.am | 2 |
3 files changed, 59 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 81025b2..ab1f832 100644 --- a/configure.in +++ b/configure.in @@ -338,11 +338,65 @@ LIBS="$tmp_LIBS" AC_SUBST(EXPAT_CFLAGS) AC_SUBST(EXPAT_LIBS) +dnl =========================== +dnl Check for SSE instructions +dnl =========================== +AC_ARG_ENABLE([sse], +[ --enable-sse[=level] Enable SSE Level 1, 2, 3 or auto [default=auto]],, + [enable_sse="auto"]) +if test "x$enable_sse" = "xyes"; then + enable_sse="auto" +fi +#AC_MSG_RESULT([SSE: $enable_sse]) +if test "x$enable_sse" = "x3"; then + AC_MSG_RESULT([Setting sse level 3]) + SSEFLAGS="-DSSE -msse -msse2 -mss3" +elif test "x$enable_sse" = "x2"; then + AC_MSG_RESULT([Setting sse level 2]) + SSEFLAGS="-DSSE -msse -msse2" +elif test "x$enable_sse" = "x1"; then + AC_MSG_RESULT([Setting sse level 1]) + SSEFLAGS="-DSSE -msse" +elif test "x$enable_sse" = "xauto"; then + AC_MSG_RESULT([Auto setting sse level]) + AC_MSG_CHECKING([for sse3 instructions]) + if grep -q "sse3" /proc/cpuinfo + then + AC_MSG_RESULT([yes]) + SSEFLAGS="-msse3" + AC_SUBST(SSEFLAGS) + else + AC_MSG_RESULT([no]) + fi + AC_MSG_CHECKING([for sse2 instructions]) + if grep -q "sse2" /proc/cpuinfo + then + AC_MSG_RESULT([yes]) + SSEFLAGS="$SSEFLAGS -msse2" + AC_SUBST(SSEFLAGS) + else + AC_MSG_RESULT([no]) + fi + AC_MSG_CHECKING([for sse instructions]) + if grep -q "sse" /proc/cpuinfo + then + AC_MSG_RESULT([yes]) + SSEFLAGS="$SSEFLAGS -DSSE -msse" + AC_SUBST(SSEFLAGS) + else + AC_MSG_RESULT([no]) + fi +else + AC_MSG_RESULT([*** Disabling SSE ***]) +fi + AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(CXXFLAGS) AC_SUBST(LDFLAGS) + + # au/Makefile AC_OUTPUT( 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 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 |