scottmac Mon Mar 17 17:06:51 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/win32/build Makefile config.w32
Log:
Fix build on Windows
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.35.2.1.2.6.2.1&r2=1.35.2.1.2.6.2.2&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.35.2.1.2.6.2.1
php-src/win32/build/Makefile:1.35.2.1.2.6.2.2
--- php-src/win32/build/Makefile:1.35.2.1.2.6.2.1 Sun Mar 16 22:16:56 2008
+++ php-src/win32/build/Makefile Mon Mar 17 17:06:51 2008
@@ -14,15 +14,13 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: Makefile,v 1.35.2.1.2.6.2.1 2008/03/16 22:16:56 helly Exp $
+# $Id: Makefile,v 1.35.2.1.2.6.2.2 2008/03/17 17:06:51 scottmac Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
LD="$(LINK)"
MC="$(MC)"
MT="$(MT)"
-RE2C="$(RE2C)"
-RE2C_FLAGS=""
MCFILE=$(BUILD_DIR)\wsyslog.rc
@@ -46,10 +44,10 @@
$(BISON) --output=Zend/zend_language_parser.c -v -d -p zend
Zend/zend_language_parser.y
Zend\zend_ini_scanner.c: Zend\zend_ini_scanner.l
- $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt
Zend\zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend\zend_ini_scanner.l
+ $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt
Zend/zend_ini_scanner_defs.h -oZend/zend_ini_scanner.c Zend/zend_ini_scanner.l
Zend\zend_language_scanner.c: Zend\zend_language_scanner.l
- $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt
$(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l
+ $(RE2C) $(RE2C_FLAGS) --case-inverted -cbdFt
Zend/zend_language_scanner_defs.h -oZend/zend_language_scanner.c
Zend/zend_language_scanner.l
PHPDLL_RES=$(BUILD_DIR)\$(PHPDLL).res
@@ -70,14 +68,14 @@
$(RC) /fo $(PHPDLL_RES) /d FILE_DESCRIPTION="\"PHP Script
Interpreter\"" \
/d FILE_NAME="\"$(PHPDLL)\"" /d PRODUCT_NAME="\"PHP Script
Interpreter\"" \
/I$(BUILD_DIR) /d MC_INCLUDE="\"$(MCFILE)\"" \
- win32\build\template.rc
+ win32\build\template.rc
$(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS)
$(STATIC_EXT_OBJS) $(PHPDLL_RES) $(MCFILE)
@$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS)
$(PHPDLL_RES) /link /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS)
$(STATIC_EXT_LDFLAGS)
[EMAIL PROTECTED](_VC_MANIFEST_EMBED_DLL)
-
+
$(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
-
+
$(BUILD_DIR) $(BUILD_DIRS_SUB):
@echo Recreating build dirs
@if not exist $(BUILD_DIR) mkdir $(BUILD_DIR)
@@ -94,7 +92,7 @@
@echo Cleaning build dirs
@for %D in (_x $(BUILD_DIRS_SUB)) do @if exist %D @del /F /Q %D\*.* >
NUL
[EMAIL PROTECTED] /F /Q $(BUILD_DIR)\*.res $(BUILD_DIR)\*.lib
$(BUILD_DIR)\*.ilk $(BUILD_DIR)\*.pdb $(BUILD_DIR)\*.exp $(PHPDEF)
$(BUILD_DIR)\php-$(PHP_VERSION_STRING)-Win32.zip
$(BUILD_DIR)\pecl-$(PHP_VERSION_STRING)-Win32.zip > NUL
- -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
+ -rmdir /s /q $(BUILD_DIR)\php-$(PHP_VERSION_STRING)
clean-pecl:
@echo Cleaning PECL targets only
http://cvs.php.net/viewvc.cgi/php-src/win32/build/config.w32?r1=1.40.2.8.2.10.2.7&r2=1.40.2.8.2.10.2.8&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.7
php-src/win32/build/config.w32:1.40.2.8.2.10.2.8
--- php-src/win32/build/config.w32:1.40.2.8.2.10.2.7 Sun Mar 16 23:54:06 2008
+++ php-src/win32/build/config.w32 Mon Mar 17 17:06:51 2008
@@ -1,5 +1,5 @@
// vim:ft=javascript
-// $Id: config.w32,v 1.40.2.8.2.10.2.7 2008/03/16 23:54:06 scottmac Exp $
+// $Id: config.w32,v 1.40.2.8.2.10.2.8 2008/03/17 17:06:51 scottmac Exp $
// "Master" config file; think of it as a configure.in
// equivalent.
@@ -15,7 +15,7 @@
// tricky escapes to get stderr redirection to work
var banner = execute('cmd /c ""' + CL + '" 2>&1"');
if (banner.match(/(\d+)\.(\d+)\.(\d+)(\.(\d+))?/)) {
- return RegExp.$1;
+ return RegExp.$1;
}
return 0;
}
@@ -26,14 +26,14 @@
// 12 is VC6
// 13 is vs.net 2003
// 14 is vs.net 2005
-
+
// do we use x64 or 80x86 version of compiler?
function probe_msvc_compiler_x64(CL)
{
// tricky escapes to get stderr redirection to work
var banner = execute('cmd /c ""' + CL + '" 2>&1"');
if (banner.match(/x64/)) {
- return 1;
+ return 1;
}
return 0;
}
@@ -60,6 +60,7 @@
if (!PATH_PROG('re2c')) {
ERROR('re2c is required')
}
+DEFINE('RE2C_FLAGS', null);
PATH_PROG('zip');
PATH_PROG('lemon');
@@ -147,7 +148,7 @@
DEFINE("PHP_LDFLAGS", "$(DLL_LDFLAGS)");
// General libs
-// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib
comdlg32.lib
+// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib
comdlg32.lib
DEFINE("LIBS", "kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib
ws2_32.lib");
// Set some debug/release specific options
@@ -174,7 +175,7 @@
if (PHP_ZTS == "yes") {
ADD_FLAG("CFLAGS", "/D ZTS=1");
}
-
+
// we want msvcrt in the PHP DLL
ADD_FLAG("PHP_LDFLAGS", "/nodefaultlib:libcmt");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
