@@ -1265,6 +1265,16 @@ def spawn(command):
1265
1265
else :
1266
1266
return cmd .compiler .spawn (command )
1267
1267
1268
+ if cmd .debug :
1269
+ mt = '/MTd' in cmd .compiler .compile_options_debug
1270
+ else :
1271
+ mt = '/MT' in cmd .compiler .compile_options
1272
+
1273
+ if mt :
1274
+ vc_config += ' Multithreaded'
1275
+
1276
+ postfix = 'MT' if mt else ''
1277
+
1268
1278
if get_build_version () < 11.0 :
1269
1279
vc_config = 'LIB ' + vc_config
1270
1280
# monkey-patch project files, because
@@ -1277,12 +1287,12 @@ def spawn(command):
1277
1287
'{config}|{platform}' .format (config = vc_config ,
1278
1288
platform = 'x64' if X64 else 'Win32' )
1279
1289
])
1280
- postfix = '_D' if cmd .debug else ''
1290
+ postfix + = '_D' if cmd .debug else ''
1281
1291
builddir = os .path .join (src_path , 'objs' , 'win32' , vc )
1282
1292
else :
1283
1293
spawn (['msbuild' , ftproj + '.sln' , '/m' , '/t:Clean;Build' ,
1284
1294
'/toolsversion:{}' .format (get_build_version ()),
1285
- ('/p:Configuration=" {config}" '
1295
+ ('/p:Configuration={config}'
1286
1296
';Platform={platform}'
1287
1297
';VisualStudioVersion={version}'
1288
1298
';ToolsVersion={version}'
@@ -1291,7 +1301,7 @@ def spawn(command):
1291
1301
version = get_build_version (),
1292
1302
toolset = int (get_build_version () * 10 )),
1293
1303
])
1294
- postfix = 'd' if cmd .debug else ''
1304
+ postfix + = 'd' if cmd .debug else ''
1295
1305
builddir = os .path .join (src_path , 'objs' , vc , vc_platform )
1296
1306
1297
1307
verstr = LOCAL_FREETYPE_VERSION .replace ('.' , '' )
0 commit comments