pajoye Fri Dec 26 14:11:44 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/build config.w32
Log:
- MFB:
- usual suspects must be in the default include/lib path (thx Rob for the
notice!)
- fix the --wtih-php-build doc, remove dead url, update the name of the
deps dir
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.38&r2=1.40.2.8.2.10.2.39&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.38
php-src/win32/build/config.w32:1.40.2.8.2.10.2.39
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.38 Thu Dec 25 00:08:51 2008
+++ php-src/win32/build/config.w32 Fri Dec 26 14:11:44 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.38 2008/12/25 00:08:51 pajoye Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.39 2008/12/26 14:11:44 pajoye Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -211,7 +211,7 @@
// Find the php_build dir - it contains headers and libraries
// that we need
-ARG_WITH('php-build', 'Path to where you extracted
http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this
source dir (..\\php_build) if not specified', 'no');
+ARG_WITH('php-build', 'Path to where you extracted the development libraries
(http://wiki.php.net/internals/windows/libs). Assumes that it is a sibling of
this source dir (..\\deps) if not specified', 'no');
if (PHP_PHP_BUILD == 'no') {
if (FSO.FolderExists("..\\deps")) {
@@ -241,8 +241,11 @@
ARG_WITH('extra-includes', 'Extra include path to use when building
everything', '');
ARG_WITH('extra-libs', 'Extra library path to use when linking everything',
'');
-var php_usual_include_suspects = PHP_PHP_BUILD+"\\include;..\\deps\\include";
-var php_usual_lib_suspects = PHP_PHP_BUILD+"\\lib;..\\deps\\lib";
+var php_usual_include_suspects = PHP_PHP_BUILD+"\\include";
+var php_usual_lib_suspects = PHP_PHP_BUILD+"\\lib";
+
+ADD_FLAG("CFLAGS", '/I "' + php_usual_include_suspects + '" ');
+ADD_FLAG("LDFLAGS", '/libpath:"\\"' + php_usual_lib_suspects + '\\"" ');
// Poke around for some headers
function probe_basic_headers()
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
