….py.

CMakeLists.txt

@@ -310,6 +310,7 @@ else() # not-unix
 		/DWIN32
 		/D_WINDOWS
 		/D_CRT_SECURE_NO_WARNINGS
+		/D_XKEYCHECK_H
 		/DVERSION=\"${VERSION}\"
 	)
 	

ext/toolchain/commands1.py

@@ -254,12 +254,18 @@ class InternalCommands:
 	gmockDir = 'gmock-1.6.0'
 
 	win32_generators = {
-		1 : Generator('Visual Studio 10'),
-		2 : Generator('Visual Studio 10 Win64'),
-		3 : Generator('Visual Studio 9 2008'),
-		4 : Generator('Visual Studio 9 2008 Win64'),
-		5 : Generator('Visual Studio 8 2005'),
-		6 : Generator('Visual Studio 8 2005 Win64')
+		1 : Generator('Visual Studio 12'),
+		2 : Generator('Visual Studio 12 Win64'),
+		3 : Generator('Visual Studio 11'),
+		4 : Generator('Visual Studio 11 Win64'),
+		5 : Generator('Visual Studio 10'),
+		6 : Generator('Visual Studio 10 Win64'),
+		7 : Generator('Visual Studio 10'),
+		8 : Generator('Visual Studio 10 Win64'),
+		9 : Generator('Visual Studio 9 2008'),
+		10: Generator('Visual Studio 9 2008 Win64'),
+		11: Generator('Visual Studio 8 2005'),
+		12: Generator('Visual Studio 8 2005 Win64')
 	}
 
 	unix_generators = {
@@ -939,7 +945,7 @@ def cleanCore(self, targets):
 
 		if generator.startswith('Visual Studio'):
 			# special case for version 10, use new /target:clean
-			if generator.startswith('Visual Studio 10'):
+			if generator.startswith('Visual Studio 10') or generator.startswith('Visual Studio 11') or generator.startswith('Visual Studio 12'):
 				for target in targets:
 					self.run_vcbuild(generator, target, self.sln_filepath(), '/target:clean')
 				
@@ -1735,6 +1741,10 @@ def get_vcvarsall(self, generator):
 			value,type = _winreg.QueryValueEx(key, '9.0')
 		elif generator.startswith('Visual Studio 10'):
 			value,type = _winreg.QueryValueEx(key, '10.0')
+		elif generator.startswith('Visual Studio 11'):
+			value,type = _winreg.QueryValueEx(key, '11.0')
+		elif generator.startswith('Visual Studio 12'):
+			value,type = _winreg.QueryValueEx(key, '12.0')
 		else:
 			raise Exception('Cannot determine vcvarsall.bat location for: ' + generator)
 		
@@ -1777,7 +1787,7 @@ def run_vcbuild(self, generator, mode, solution, args='', dir='', config32='Win3
 		else:
 			config = 'Debug'
 				
-		if generator.startswith('Visual Studio 10'):
+		if generator.startswith('Visual Studio 10') or generator.startswith('Visual Studio 11') or generator.startswith('Visual Studio 12'):
 			cmd = ('@echo off\n'
 				'call "%s" %s \n'
 				'cd "%s"\n'

src/gui/res/SetupWizardBase.ui

@@ -175,7 +175,7 @@
       <item row="1" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
-         <string>Passward:</string>
+         <string>Password:</string>
         </property>
        </widget>
       </item>

src/lib/platform/MSWindowsScreen.cpp

@@ -43,7 +43,6 @@
 #include "base/TMethodJob.h"
 
 #include <string.h>
-#include <pbt.h>
 #include <Shlobj.h>
 #include <comutil.h>
 #include <algorithm>