pajoye                                   Fri, 07 Jan 2011 15:51:36 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=307227

Log:
- define the php*.lib/dll names

Changed paths:
    U   php/php-src/branches/PHP_5_3/win32/build/confutils.js
    U   php/php-src/trunk/win32/build/config.w32.h.in
    U   php/php-src/trunk/win32/build/confutils.js

Modified: php/php-src/branches/PHP_5_3/win32/build/confutils.js
===================================================================
--- php/php-src/branches/PHP_5_3/win32/build/confutils.js       2011-01-07 
14:58:23 UTC (rev 307226)
+++ php/php-src/branches/PHP_5_3/win32/build/confutils.js       2011-01-07 
15:51:36 UTC (rev 307227)
@@ -1702,16 +1702,10 @@
        /* Generate flags file */
        /* spit out variable definitions */
        CJ = FSO.CreateTextFile(dest + "/config.phpize.js");
-/*
-       function escape(in) {
-               val = t.replace(new RegExp('("\\\\)', "g"), '\\$1');
-       }
-*/
-       //if (typeof t == "string") {
-
-       CJ.WriteLine("var PHP_ZTS =" + '"' + PHP_ZTS + '"');
-       CJ.WriteLine("var PHP_LIB =" + '"' + get_define('PHPLIB') + '"');

+       CJ.WriteLine("var PHP_ZTS =" + '"' + PHP_ZTS + '"');
+       CJ.WriteLine("var PHP_DLL_LIB =" + '"' + get_define('PHPLIB') + '"');
+       CJ.WriteLine("var PHP_DLL =" + '"' + get_define('PHPDLL') + '"');
        CJ.WriteBlankLines(1);
        CJ.Close();
 }

Modified: php/php-src/trunk/win32/build/config.w32.h.in
===================================================================
--- php/php-src/trunk/win32/build/config.w32.h.in       2011-01-07 14:58:23 UTC 
(rev 307226)
+++ php/php-src/trunk/win32/build/config.w32.h.in       2011-01-07 15:51:36 UTC 
(rev 307227)
@@ -6,7 +6,7 @@
 /* Define the minimum supported version */
 #undef _WIN32_WINNT
 #undef NTDDI_VERSION
-#define _WIN32_WINNT 0x500
+#define _WIN32_WINNT 0x502
 #define NTDDI_VERSION  _WIN32_WIN2K

 /* Default PHP / PEAR directories */

Modified: php/php-src/trunk/win32/build/confutils.js
===================================================================
--- php/php-src/trunk/win32/build/confutils.js  2011-01-07 14:58:23 UTC (rev 
307226)
+++ php/php-src/trunk/win32/build/confutils.js  2011-01-07 15:51:36 UTC (rev 
307227)
@@ -1702,16 +1702,10 @@
        /* Generate flags file */
        /* spit out variable definitions */
        CJ = FSO.CreateTextFile(dest + "/config.phpize.js");
-/*
-       function escape(in) {
-               val = t.replace(new RegExp('("\\\\)', "g"), '\\$1');
-       }
-*/
-       //if (typeof t == "string") {
-
-       CJ.WriteLine("var PHP_ZTS =" + '"' + PHP_ZTS + '"');
-       CJ.WriteLine("var PHP_LIB =" + '"' + get_define('PHPLIB') + '"');

+       CJ.WriteLine("var PHP_ZTS =" + '"' + PHP_ZTS + '"');
+       CJ.WriteLine("var PHP_DLL_LIB =" + '"' + get_define('PHPLIB') + '"');
+       CJ.WriteLine("var PHP_DLL =" + '"' + get_define('PHPDLL') + '"');
        CJ.WriteBlankLines(1);
        CJ.Close();
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to