diff --git a/extern/CMakeProject-mad.cmake b/extern/CMakeProject-mad.cmake
index 4072d7f1bd..aa223391cd 100644
--- a/extern/CMakeProject-mad.cmake
+++ b/extern/CMakeProject-mad.cmake
@@ -62,9 +62,15 @@ else()
     # first glance.
     sm_add_compile_definition("mad" ASO_ZEROCHECK)
     sm_add_compile_definition("mad" $<$<CONFIG:Debug>:FPM_DEFAULT>)
-    sm_add_compile_definition("mad" $<$<CONFIG:Release>:FPM_INTEL>)
-    sm_add_compile_definition("mad" $<$<CONFIG:MinSizeRel>:FPM_INTEL>)
-    sm_add_compile_definition("mad" $<$<CONFIG:RelWithDebInfo>:FPM_INTEL>)
+    if(SIZEOF_INTPTR_T EQUAL 8)
+      sm_add_compile_definition("mad" $<$<CONFIG:Release>:FPM_64BIT>)
+      sm_add_compile_definition("mad" $<$<CONFIG:MinSizeRel>:FPM_64BIT>)
+      sm_add_compile_definition("mad" $<$<CONFIG:RelWithDebInfo>:FPM_64BIT>)
+    else()
+      sm_add_compile_definition("mad" $<$<CONFIG:Release>:FPM_INTEL>)
+      sm_add_compile_definition("mad" $<$<CONFIG:MinSizeRel>:FPM_INTEL>)
+      sm_add_compile_definition("mad" $<$<CONFIG:RelWithDebInfo>:FPM_INTEL>)
+    endif()
     # TODO: Provide a proper define for inline.
     sm_add_compile_definition("mad" inline=__inline)
   elseif(APPLE OR UNIX)
diff --git a/extern/mad-0.15.1b/mad.h b/extern/mad-0.15.1b/mad.h
index 9ef6cc8f70..e7ba33c47f 100644
--- a/extern/mad-0.15.1b/mad.h
+++ b/extern/mad-0.15.1b/mad.h
@@ -24,9 +24,11 @@
 extern "C" {
 # endif
 
+# if _WIN64
+# define FPM_64BIT
+# else
 # define FPM_INTEL
-
-
+# endif
 
 # define SIZEOF_INT 4
 # define SIZEOF_LONG 4