diff options
Diffstat (limited to 'win32/build')
| -rw-r--r-- | win32/build/Makefile | 2 | ||||
| -rw-r--r-- | win32/build/config.w32 | 11 | ||||
| -rw-r--r-- | win32/build/config.w32.h.in | 4 | ||||
| -rw-r--r-- | win32/build/confutils.js | 2 | ||||
| -rw-r--r-- | win32/build/deplister.c | 4 |
5 files changed, 14 insertions, 9 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 5f6338216..837fcc863 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -14,7 +14,7 @@ # | Author: Wez Furlong <wez@thebrainroom.com> | # +----------------------------------------------------------------------+ # -# $Id: Makefile 289764 2009-10-19 19:05:58Z pajoye $ +# $Id: Makefile 289763 2009-10-19 19:02:12Z pajoye $ # This is the makefile template for the win32 build CC="$(CL)" diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 67b9fe6fd..5f10c7e6a 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -1,5 +1,5 @@ // vim:ft=javascript -// $Id: config.w32 289764 2009-10-19 19:05:58Z pajoye $ +// $Id: config.w32 291639 2009-12-03 11:50:32Z kalle $ // "Master" config file; think of it as a configure.in // equivalent. @@ -15,6 +15,7 @@ if (!CL) { // 1310 is vs.net 2003 // 1400 is vs.net 2005 // 1500 is vs.net 2008 +// 1600 is vs.net 2010 // Which version of the compiler do we have? VCVERS = probe_binary(CL).substr(0, 5).replace('.', ''); STDOUT.WriteLine(" Detected compiler " + VC_VERSIONS[VCVERS]); @@ -113,13 +114,13 @@ DEFINE("BASE_INCLUDES", "/I . /I main /I Zend /I TSRM /I ext "); // CFLAGS for building the PHP dll DEFINE("CFLAGS_PHP", "/D _USRDLL /D PHP5DLLTS_EXPORTS /D PHP_EXPORTS \ -/D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=0x400"); +/D LIBZEND_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=0x500"); DEFINE('CFLAGS_PHP_OBJ', '$(CFLAGS_PHP) $(STATIC_EXT_CFLAGS)'); // General CFLAGS for building objects DEFINE("CFLAGS", "/nologo /FD $(BASE_INCLUDES) /D _WINDOWS \ -/D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS"); +/D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS /W3 "); if (VCVERS < 1400) { // Enable automatic precompiled headers @@ -147,7 +148,7 @@ if (VCVERS >= 1400) { } } -ARG_WITH('mp', 'Tell VC9 use up to [n,auto,disable] processes for compilation', 'auto'); +ARG_WITH('mp', 'Tell VC9+ use up to [n,auto,disable] processes for compilation', 'auto'); if (VCVERS >= 1500 && PHP_MP != 'disable') { // no from disable-all if(PHP_MP == 'auto' || PHP_MP == 'no') { @@ -177,7 +178,7 @@ DEFINE("LIBS", "kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_3 // Set some debug/release specific options if (PHP_DEBUG == "yes") { - ADD_FLAG("CFLAGS", "/LDd /MDd /Gm /Od /D _DEBUG /D ZEND_DEBUG=1 " + + ADD_FLAG("CFLAGS", "/LDd /MDd /W3 /Gm /Od /D _DEBUG /D ZEND_DEBUG=1 " + (X64?"/Zi":"/ZI")); ADD_FLAG("LDFLAGS", "/debug"); // Avoid problems when linking to release libraries that use the release diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index e585e0ab5..27ff05258 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -1,6 +1,6 @@ /* Build Configuration Template for Win32. - $Id: config.w32.h.in 282624 2009-06-23 06:56:45Z kalle $ + $Id: config.w32.h.in 291951 2009-12-10 14:08:19Z pajoye $ */ /* Define the minimum supported version */ @@ -28,6 +28,8 @@ #define PHP_EXT_DES_CRYPT 1 #define PHP_MD5_CRYPT 1 #define PHP_BLOWFISH_CRYPT 1 +#define PHP_SHA512_CRYPT 1 +#define PHP_SHA256_CRYPT 1 /* PHP Runtime Configuration */ #define PHP_URL_FOPEN 1 diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 28b5e0d86..ed3f2424f 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -41,6 +41,7 @@ VC_VERSIONS[1300] = 'MSVC7 (Visual C++ 2002)'; 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)';
var VC_VERSIONS_SHORT = new Array();
VC_VERSIONS_SHORT[1200] = 'VC6';
@@ -48,6 +49,7 @@ VC_VERSIONS_SHORT[1300] = 'VC7'; VC_VERSIONS_SHORT[1310] = 'VC7.1';
VC_VERSIONS_SHORT[1400] = 'VC8';
VC_VERSIONS_SHORT[1500] = 'VC9';
+VC_VERSIONS_SHORT[1600] = 'VC10';
if (PROGRAM_FILES == null) {
PROGRAM_FILES = "C:\\Program Files";
diff --git a/win32/build/deplister.c b/win32/build/deplister.c index f6f1ce5ad..79191f0b6 100644 --- a/win32/build/deplister.c +++ b/win32/build/deplister.c @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2009 The PHP Group | + | Copyright (c) 1997-2010 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: deplister.c 272370 2008-12-31 11:15:49Z sebastian $ */ +/* $Id: deplister.c 293036 2010-01-03 09:23:27Z sebastian $ */ /* This little application will list the DLL dependencies for a PE * module to it's stdout for use by distro/installer building tools */ |