From 5fc6f5df54a2650c4a53f04ee38cfebec0a515e1 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 14 May 2008 20:45:55 +0000
Subject: Add flag to force disable assembly (some people get compile errors
 for unknown reasons).

git-svn-id: http://svn.drobilla.net/lad/ingen@1205 a436a847-0d15-0410-975c-d299462d15a1
---
 configure.ac                       | 11 ++++++++++-
 src/libs/engine/ConnectionImpl.cpp |  2 +-
 src/libs/engine/engine.cpp         |  2 +-
 src/libs/engine/util.hpp           | 15 ++++++++-------
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index c8b923bc..3e5a57bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ AC_ARG_ENABLE(debug_symbols,
 
 AC_ARG_ENABLE(debug_asertions,
 	[AS_HELP_STRING(--enable-debug-assertions, [Enable debugging assertions (no)])],
-	[assertions="$enableval"])
+	[debug_assertions="$enableval"])
 
 if test "$debug_symbols" = "yes"; then
   CFLAGS="-O0 -g"
@@ -86,6 +86,14 @@ else
   CXXFLAGS="$CXXFLAGS -DNDEBUG"
 fi
 
+assembly="yes"
+AC_ARG_ENABLE(assembly,
+	[AS_HELP_STRING(--enable-assembly, [Use assembly code to fix denormals (yes)])],
+	[assembly="$enableval"])
+if test "$assembly" = "yes"; then
+  AC_DEFINE([USE_ASSEMBLY], 1, [Defined if assembly code should be used where possible])
+fi
+
 # Boost shared_ptr debugging
 pointer_debug="no"
 AC_ARG_ENABLE(pointer_debug,
@@ -312,6 +320,7 @@ AC_MSG_RESULT([LV2 Plugin support:      $build_lv2])
 AC_MSG_RESULT([LADSPA Plugin support:   $build_ladspa])
 AC_MSG_RESULT([])
 AC_MSG_RESULT([Ingen:])
+AC_MSG_RESULT([    Denormal fixes (assembly): $assembly])
 AC_MSG_RESULT([    Engine library/OSC server: $build_ingen_server])
 AC_MSG_RESULT([    JACK in-process engine:    $build_in_process_engine])
 AC_MSG_RESULT([    Client library:            $build_ingen_client_lib])
diff --git a/src/libs/engine/ConnectionImpl.cpp b/src/libs/engine/ConnectionImpl.cpp
index 9cd6f3c9..63f2028c 100644
--- a/src/libs/engine/ConnectionImpl.cpp
+++ b/src/libs/engine/ConnectionImpl.cpp
@@ -169,7 +169,7 @@ ConnectionImpl::process(ProcessContext& context)
 
 	} else if (_must_mix && type() == DataType::EVENT) {
 
-		cerr << "WARNING: No event mixing." << endl;
+		std::cerr << "WARNING: No event mixing." << std::endl;
 	
 	}
 
diff --git a/src/libs/engine/engine.cpp b/src/libs/engine/engine.cpp
index 17607fa1..45c17354 100644
--- a/src/libs/engine/engine.cpp
+++ b/src/libs/engine/engine.cpp
@@ -46,7 +46,7 @@ launch_osc_engine(int port)
 		//return SharedPtr<EngineInterface>(new OSCEngineSender(
 		//			string("osc.udp://localhost:").append(port_str)));
 	} else {
-		cerr << "Failed to launch engine process." << endl;
+		std::cerr << "Failed to launch engine process." << std::endl;
 		//return SharedPtr<EngineInterface>();
 		return false;
 	}
diff --git a/src/libs/engine/util.hpp b/src/libs/engine/util.hpp
index 4d03d94e..1daf3554 100644
--- a/src/libs/engine/util.hpp
+++ b/src/libs/engine/util.hpp
@@ -15,9 +15,10 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef UTIL_H
-#define UTIL_H
+#ifndef UTIL_HPP
+#define UTIL_HPP
 
+#include CONFIG_H_PATH
 #include <iostream>
 #include <cstdlib>
 
@@ -26,8 +27,6 @@
 #include <xmmintrin.h>
 #endif
 
-using std::cerr; using std::endl;
-
 namespace Ingen {
 
 /** Set flags to disable denormal processing.
@@ -35,6 +34,7 @@ namespace Ingen {
 inline void
 set_denormal_flags()
 {
+#ifdef USE_ASSEMBLY
 #ifdef __SSE__
 	unsigned long a, b, c, d;
 
@@ -60,13 +60,14 @@ set_denormal_flags()
 			//cerr << "Set SSE denormal fix flag." << endl;
 		}
 	} else {
-		cerr << "This code has been built with SSE support, but your processor does"
-			<< " not support the SSE instruction set." << endl << "Exiting." << endl;
+		std::cerr << "This code has been built with SSE support, but your processor does"
+			<< " not support the SSE instruction set." << std::endl << "Exiting." << std::endl;
 		exit(EXIT_FAILURE);
 	}
 #endif
+#endif
 }
 
 } // namespace Ingen
 
-#endif // UTIL_H
+#endif // UTIL_HPP
-- 
cgit v1.2.1