From: Pierre Joye <pajoye@php.net>
Date: Fri, 26 Dec 2008 14:10:26 +0000 (+0000)
Subject: - usual suspects must be in the default include/lib path (thx Rob for the notice!)
X-Git-Tag: php-5.4.0alpha1~191^2~4746
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65a7e5986730a8da24273d66e9a62e70e0f4c3c0;p=php

- 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
---

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 5a6c72fc06..fd06de8bb0 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -209,7 +209,7 @@ if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") {
 
 // 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")) {
@@ -242,6 +242,9 @@ 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";
 
+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()
 {