archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- #52607, fix ENV conflit with win SDK 7.1

Browse source
This commit is contained in:
Pierre Joye 2010-08-15 13:54:03 +00:00
parent fe07ed4b42
commit 7dd694ec15
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
win32/build/Makefile
View file

@ -17,7 +17,7 @@
# $Id$ # $Id$
# This is the makefile template for the win32 build # This is the makefile template for the win32 build
CC="$(CL)" CC="$(PHP_CL)"
LD="$(LINK)" LD="$(LINK)"
MC="$(MC)" MC="$(MC)"
MT="$(MT)" MT="$(MT)"
@ -146,7 +146,7 @@ dist: all build-dist
snap: build-snap build-dist snap: build-snap build-dist
$(BUILD_DIR)\deplister.exe: win32\build\deplister.c $(BUILD_DIR)\deplister.exe: win32\build\deplister.c
$(CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c imagehlp.lib $(PHP_CL) /Fo$(BUILD_DIR)\ /Fd$(BUILD_DIR)\ /Fp$(BUILD_DIR)\ /FR$(BUILD_DIR) /Fe$(BUILD_DIR)\deplister.exe win32\build\deplister.c imagehlp.lib
msi-installer: dist msi-installer: dist
$(BUILD_DIR)\php.exe ..\php-installer\build-installer.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(PECL_TARGETS)" $(BUILD_DIR)\php.exe ..\php-installer\build-installer.php "$(BUILD_DIR)" "$(PHPDLL)" "$(SAPI_TARGETS)" "$(EXT_TARGETS)" "$(PECL_TARGETS)"

8
win32/build/config.w32
View file

@ -4,8 +4,8 @@
// equivalent. // equivalent.
ARG_WITH('cygwin', 'Path to cygwin utilities on your system', '\\cygwin'); ARG_WITH('cygwin', 'Path to cygwin utilities on your system', '\\cygwin');
CL = PATH_PROG('cl'); PHP_CL = PATH_PROG('cl', null, 'PHP_CL');
if (!CL) { if (!PHP_CL) {
ERROR("MS C++ compiler is required"); ERROR("MS C++ compiler is required");
} }
@ -17,7 +17,7 @@ if (!CL) {
// 1500 is vs.net 2008 // 1500 is vs.net 2008
// 1600 is vs.net 2010 // 1600 is vs.net 2010
// Which version of the compiler do we have? // Which version of the compiler do we have?
VCVERS = probe_binary(CL).substr(0, 5).replace('.', ''); VCVERS = probe_binary(PHP_CL).substr(0, 5).replace('.', '');
STDOUT.WriteLine(" Detected compiler " + VC_VERSIONS[VCVERS]); STDOUT.WriteLine(" Detected compiler " + VC_VERSIONS[VCVERS]);
if (VCVERS < 1500) { if (VCVERS < 1500) {
@ -29,7 +29,7 @@ DEFINE("PHP_COMPILER_SHORT", VC_VERSIONS_SHORT[VCVERS]);
AC_DEFINE('PHP_COMPILER_ID', VC_VERSIONS_SHORT[VCVERS], "Compiler compatibility ID"); AC_DEFINE('PHP_COMPILER_ID', VC_VERSIONS_SHORT[VCVERS], "Compiler compatibility ID");
// do we use x64 or 80x86 version of compiler? // do we use x64 or 80x86 version of compiler?
X64 = probe_binary(CL, 64); X64 = probe_binary(PHP_CL, 64, null, 'PHP_CL');
if (X64) { if (X64) {
STDOUT.WriteLine(" Detected 64-bit compiler"); STDOUT.WriteLine(" Detected 64-bit compiler");
} else { } else {