Merge branch 'master' into cairocanvas

[ardour.git] / libs / pbd / fpu.cc

diff --git a/libs/pbd/fpu.cc b/libs/pbd/fpu.cc
index 8929491cd9976fea1589dbd18b7cc6ac5df51a7b..b12d341366fe8c4ae701ebb845f613535d2be7bf 100644 (file)
--- a/libs/pbd/fpu.cc
+++ b/libs/pbd/fpu.cc
@@ -16,7 +16,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 */
-
+#ifndef  COMPILER_MSVC
 #include "libpbd-config.h"
 
 #define _XOPEN_SOURCE 600
@@ -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"
@@ -141,3 +144,7 @@ FPU::FPU ()
 FPU::~FPU ()
 {
 }
+
+#else  // COMPILER_MSVC
+       const char* pbd_fpu = "pbd/msvc/fpu.cc takes precedence over this file";
+#endif // COMPILER_MSVC