pajoye Sun Jul 6 09:55:45 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/build config.w32
Log:
- correctly test the VCVERS (four digits now)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.19&r2=1.40.2.8.2.10.2.20&diff_format=u
Index: php-src/win32/build/config.w32
diff -u php-src/win32/build/config.w32:1.40.2.8.2.10.2.19
php-src/win32/build/config.w32:1.40.2.8.2.10.2.20
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.19 Sat Jul 5 19:53:04 2008
+++ php-src/win32/build/config.w32 Sun Jul 6 09:55:44 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.19 2008/07/05 19:53:04 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.20 2008/07/06 09:55:44 pajoye Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -144,7 +144,7 @@
DEFINE("CFLAGS", "/nologo /FD $(BASE_INCLUDES) /D _WINDOWS \
/D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D _MBCS");
-if (VCVERS < 14) {
+if (VCVERS < 1400) {
// Enable automatic precompiled headers
ADD_FLAG('CFLAGS', ' /YX ');
@@ -154,7 +154,7 @@
}
}
-if (VCVERS >= 14) {
+if (VCVERS >= 1400) {
// fun stuff: MS deprecated ANSI stdio and similar functions
// disable annoying warnings. In addition, time_t defaults
// to 64-bit. Ask for 32-bit.
@@ -301,7 +301,7 @@
for (i = 0; i < path.length; i++) {
f = FSO.GetAbsolutePathName(path[i]);
if (FSO.FolderExists(f)) {
- if (VCVERS <= 12 && f.indexOf(" ") >= 0) {
+ if (VCVERS <= 1200 && f.indexOf(" ") >= 0) {
ADD_FLAG("LDFLAGS", '/libpath:"\\"' + f
+ '\\"" ');
} else {
ADD_FLAG("LDFLAGS", '/libpath:"' + f +
'" ');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
