From 7cc9a15c33409527ff71339cfb60059c7b1f0a4a Mon Sep 17 00:00:00 2001
From: Ray Speth <speth@mit.edu>
Date: Thu, 24 May 2012 16:29:46 +0000
Subject: [PATCH] Fixed a compiler warning when building a 32-bit Matlab
 extension with MSVC

---
 src/matlab/SConscript | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/matlab/SConscript b/src/matlab/SConscript
index 50727a006..e8417e123 100644
--- a/src/matlab/SConscript
+++ b/src/matlab/SConscript
@@ -20,7 +20,8 @@ if localenv['OS'] == 'Windows':
 
     if localenv['CC'] == 'cl':
         linkflags.append('/export:mexFunction')
-        linkflags.append('/MACHINE:X%i' % localenv['OS_BITS'])
+        machtype = 'X64' if localenv['OS_BITS'] == 64 else 'X86'
+        linkflags.append('/MACHINE:' + machtype)
     elif localenv['CC'] == 'gcc':
         linkflags.append('-Wl,--export-all-symbols')
         linkflags.extend(['-static-libgcc', '-static-libstdc++'])