7 files changed, 27 insertions, 22 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile
index e2d62545b8..057b584549 100644
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -55,10 +55,10 @@ Zend\zend_language_parser.c Zend\zend_language_parser.h: Zend\zend_language_pars
 
 !if $(RE2C) != ""
 Zend\zend_ini_scanner.c: Zend\zend_ini_scanner.l
-	$(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l
+	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l
 
 Zend\zend_language_scanner.c: Zend\zend_language_scanner.l
-	$(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l
+	$(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c Zend/zend_language_scanner.l
 !endif
 
 !if $(PGOMGR) != ""
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index f025ae2f39..849a9372f7 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -155,7 +155,7 @@ if (VCVERS >= 1400) {
 	// disable annoying warnings.  In addition, time_t defaults
 	// to 64-bit.  Ask for 32-bit.
 	if (X64) {
-		ADD_FLAG('CFLAGS', ' /wd4996 /Wp64 ');
+		ADD_FLAG('CFLAGS', ' /wd4996 ');
 	} else {
 		ADD_FLAG('CFLAGS', ' /wd4996 /D_USE_32BIT_TIME_T=1 ');
 	}
@@ -181,8 +181,13 @@ if (VCVERS >= 1500 && PHP_MP != 'disable') {
 }
 
 // General link flags
-DEFINE("LDFLAGS", "/nologo /version:" +
-	PHP_VERSION + "." + PHP_MINOR_VERSION + "." + PHP_RELEASE_VERSION);
+
+if (VCVERS >= 1700) {
+	DEFINE("LDFLAGS", "/nologo ");
+} else {
+	DEFINE("LDFLAGS", "/nologo /version:" +
+			PHP_VERSION + "." + PHP_MINOR_VERSION + "." + PHP_RELEASE_VERSION);
+}
 
 // General DLL link flags
 DEFINE("DLL_LDFLAGS", "/dll ");
@@ -359,7 +364,7 @@ ADD_SOURCES("Zend", "zend_language_parser.c zend_language_scanner.c \
 	zend_stream.c zend_iterators.c zend_interfaces.c zend_objects.c \
 	zend_object_handlers.c zend_objects_API.c \
 	zend_default_classes.c zend_execute.c zend_strtod.c zend_gc.c zend_closures.c \
-	zend_float.c zend_string.c");
+	zend_float.c zend_string.c zend_generators.c");
 
 if (VCVERS == 1200) {
 	AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);
@@ -368,7 +373,7 @@ if (VCVERS == 1200) {
 ADD_SOURCES("main", "main.c snprintf.c spprintf.c getopt.c fopen_wrappers.c \
 	php_scandir.c php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \
 	strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c network.c \
-	php_open_temporary_file.c php_logos.c output.c internal_functions.c php_sprintf.c");
+	php_open_temporary_file.c output.c internal_functions.c php_sprintf.c");
 ADD_SOURCES("win32", "inet.c fnmatch.c sockets.c");
 
 // Newer versions have it
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index c6cf076bab..9efdfdea3e 100644
--- a/win32/build/config.w32.h.in
+++ b/win32/build/config.w32.h.in
@@ -6,8 +6,8 @@
 /* Define the minimum supported version */
 #undef _WIN32_WINNT
 #undef NTDDI_VERSION
-#define _WIN32_WINNT 0x0501
-#define NTDDI_VERSION  0x05010200
+#define _WIN32_WINNT 0x0600
+#define NTDDI_VERSION  0x06000100
 
 /* Default PHP / PEAR directories */
 #define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):""
diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in
index b8bf45ea57..7b3b40633b 100644
--- a/win32/build/config.w32.phpize.in
+++ b/win32/build/config.w32.phpize.in
@@ -134,7 +134,7 @@ if (VCVERS >= 1400) {
 	// disable annoying warnings.  In addition, time_t defaults
 	// to 64-bit.  Ask for 32-bit.
 	if (X64) {
-		ADD_FLAG('CFLAGS', ' /wd4996 /Wp64 ');
+		ADD_FLAG('CFLAGS', ' /wd4996 ');
 	} else {
 		ADD_FLAG('CFLAGS', ' /wd4996 /D_USE_32BIT_TIME_T=1 ');
 	}
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index c0a1ce895b..d9a0c1b5f1 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -46,6 +46,7 @@ VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';
 VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
 VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
 VC_VERSIONS[1600] = 'MSVC10 (Visual C++ 2010)';
+VC_VERSIONS[1700] = 'MSVC11 (Visual C++ 2012)';
 
 var VC_VERSIONS_SHORT = new Array();
 VC_VERSIONS_SHORT[1200] = 'VC6';
@@ -54,6 +55,7 @@ VC_VERSIONS_SHORT[1310] = 'VC7.1';
 VC_VERSIONS_SHORT[1400] = 'VC8';
 VC_VERSIONS_SHORT[1500] = 'VC9';
 VC_VERSIONS_SHORT[1600] = 'VC10';
+VC_VERSIONS_SHORT[1700] = 'VC11';
 
 if (PROGRAM_FILES == null) {
 	PROGRAM_FILES = "C:\\Program Files";
diff --git a/win32/build/libs_version.txt b/win32/build/libs_version.txt
index ddbd925934..44420ddec8 100644
--- a/win32/build/libs_version.txt
+++ b/win32/build/libs_version.txt
@@ -1,16 +1,16 @@
 bz2-1.0.6
-cclient-2007e
+cclient-2007f
 freetype-2.4.10
-icu-49.1.2
-jpeglib-8
+icu-51.2
+jpeglib-9
 libcurl-7.30.0
 libiconv-1.14
 libmcrypt-2.5.8
-libmpir-2.5.1
-libpng-1.2.50
-libpq-8.3.6
+libmpir-2.6.0
+libpng-1.5.14
+libpq-9.2.2
 libssh2-1.4.2
-libtidy-20090325
+libtidy-20090406
 libxslt-1.1.27
-libxml-2.7.8
-openssl-0.9.8y
+libxml-2.9.1
+openssl-1.0.1e
diff --git a/win32/build/mkdist.php b/win32/build/mkdist.php
index 5ed9bdc81a..23d26c9c53 100644
--- a/win32/build/mkdist.php
+++ b/win32/build/mkdist.php
@@ -238,8 +238,6 @@ $text_files = array(
 	"php.ini-development" => "php.ini-development",
 	"php.ini-production" => "php.ini-production",
 	"win32/install.txt" => "install.txt",
-	"win32/pws-php5cgi.reg" => "pws-php5cgi.reg",
-	"win32/pws-php5isapi.reg" => "pws-php5isapi.reg",
 );
 
 foreach ($text_files as $src => $dest) {
@@ -443,7 +441,7 @@ function make_phar_dot_phar($dist_dir)
 	$phar->setStub(implode('', $stub));
 
 	echo "Creating phar.phar.bat\n";
-	file_put_contents($dist_dir . '/phar.phar.bat', "%~dp0php.exe %~dp0pharcommand.phar %*\r\n");
+	file_put_contents($dist_dir . '/phar.phar.bat', "\"%~dp0php.exe\" \"%~dp0pharcommand.phar\" %*\r\n");
 }
 
 if (!is_dir($test_dir)) {