finished merge of cairocanvas with windows and windows+cc branches

3 files changed, 54 insertions, 7 deletions

diff --git a/libs/pbd/fpu.cc b/libs/pbd/fpu.cc
index 73bc7e599d..b12d341366 100644
--- a/libs/pbd/fpu.cc
+++ b/libs/pbd/fpu.cc
@@ -39,11 +39,14 @@ FPU::FPU ()
 
 	_flags = Flags (0);
 
+#if defined(__MINGW64__) // Vkamyshniy: under __MINGW64__ the assembler code below is not compiled
+	return;
+#endif
+
 #if !( (defined __x86_64__) || (defined __i386__) ) // !ARCH_X86
 	return;
 #else
 
-	
 #ifndef _LP64 //USE_X86_64_ASM
 	asm volatile (
 		"mov $1, %%eax\n"
diff --git a/libs/pbd/pathexpand.cc b/libs/pbd/pathexpand.cc
index 5784ec9428..26454e4164 100644
--- a/libs/pbd/pathexpand.cc
+++ b/libs/pbd/pathexpand.cc
@@ -33,12 +33,57 @@
 using std::string;
 using std::vector;
 
+#ifdef COMPILER_MINGW
+
+#include <stdlib.h>
+#include <glibmm.h>
+
+/****************************************************************
+ * Emulate POSIX realpath() using Win32 _fullpath() since realpath()
+ * is not available.
+ *
+ * Returns:
+ *    On Success: A pointer to the resolved (absolute) path
+ *    On Failure: 0 (NULL)
+ */
+
+static char* 
+realpath (const char *original_path, char resolved_path[_MAX_PATH+1])
+{
+	char *rpath = 0;
+	bool bIsSymLink = false; // We'll probably need to test the incoming path
+	                         // to find out if it points to a Windows shortcut
+	                         // (or a hard link) and set this appropriately.
+
+	if (bIsSymLink) {
+		// At the moment I'm not sure if Windows '_fullpath()' is directly
+		// equivalent to POSIX 'realpath()' - in as much as the latter will
+		// resolve the supplied path if it happens to point to a symbolic
+		// link ('_fullpath()' probably DOESN'T do this but I'm not really
+		// sure if Ardour needs such functionality anyway). Therefore we'll
+		// possibly need to add that functionality here at a later date.
+	} else {
+		char temp[(_MAX_PATH+1)*6]; // Allow for maximum length of a path in wchar characters
+		
+		// POSIX 'realpath()' requires that the buffer size is at
+		// least PATH_MAX+1, so assume that the user knew this !!
+
+		rpath = _fullpath (temp, Glib::locale_from_utf8 (original_path).c_str(), _MAX_PATH);
+
+		if (0 != rpath) {
+			snprintf (resolved_path, _MAX_PATH+1, "%s", Glib::locale_to_utf8 (temp).c_str());
+		}
+			
+	}
+	
+	return (rpath);
+}
+
+#endif  // COMPILER_MINGW
+
 string
 PBD::canonical_path (const std::string& path)
 {
-#ifdef COMPILER_MINGW
-	return path;
-#else
 	char buf[PATH_MAX+1];
 
 	if (!realpath (path.c_str(), buf) && (errno != ENOENT)) {
@@ -46,7 +91,6 @@ PBD::canonical_path (const std::string& path)
 	}
 
 	return string (buf);
-#endif
 }
 
 string
diff --git a/libs/pbd/pbd/abstract_ui.h b/libs/pbd/pbd/abstract_ui.h
index 1ceefe7b3b..dc5620b2ef 100644
--- a/libs/pbd/pbd/abstract_ui.h
+++ b/libs/pbd/pbd/abstract_ui.h
@@ -52,7 +52,7 @@
 class Touchable;
 
 template<typename RequestObject>
-class /*ABSTRACT_UI_API*/ AbstractUI : public BaseUI /* see notes in visibility.h about why this is not LIBPBD_API */
+class ABSTRACT_UI_API AbstractUI : public BaseUI
 {
   public:
 	AbstractUI (const std::string& name);
@@ -75,7 +75,7 @@ class /*ABSTRACT_UI_API*/ AbstractUI : public BaseUI /* see notes in visibility.
         };
 	typedef typename RequestBuffer::rw_vector RequestBufferVector;
 
-#if defined(__MINGW32__)
+#if defined(__MINGW32__) && !defined (__MINGW64__)
 
 	struct pthread_cmp
 	{