diff --git a/desmume/configure.ac b/desmume/configure.ac
index 73f6ebcd4..b028b91c8 100644
--- a/desmume/configure.ac
+++ b/desmume/configure.ac
@@ -25,9 +25,6 @@ dnl -- check for endianess
 AC_C_BIGENDIAN
 
 dnl --- Other prerequisites ---
-dnl - FIXME: provide a way to compile asm sources 
-dnl -        and/or autodecide if we can have SSE2
-AC_DEFINE(NOSSE2) 
 dnl - Check for pkg-config macros
 m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG])
 dnl - Check for intltool/gettext macros
diff --git a/desmume/src/matrix.cpp b/desmume/src/matrix.cpp
index 2f9cf21d0..f7495d778 100644
--- a/desmume/src/matrix.cpp
+++ b/desmume/src/matrix.cpp
@@ -33,7 +33,7 @@ void MatrixInit  (float *matrix)
 	matrix[0] = matrix[5] = matrix[10] = matrix[15] = 1.f;
 }
 
-#ifdef NOSSE2
+#if not defined(WIN32) || defined(NOSSE2)
 void MATRIXFASTCALL MatrixMultVec4x4 (const float *matrix, float *vecPtr)
 {
 	float x = vecPtr[0];