wez Wed Dec 3 09:55:03 2003 EDT
Modified files:
/php-src/win32/build Makefile buildconf.js confutils.js
Log:
Propogate LDFLAGS from extensions to PHPDLL when building them statically.
Move ZendEngine2 to Zend while running buildconf
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.1 php-src/win32/build/Makefile:1.2
--- php-src/win32/build/Makefile:1.1 Tue Dec 2 18:17:04 2003
+++ php-src/win32/build/Makefile Wed Dec 3 09:55:03 2003
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: Makefile,v 1.1 2003/12/02 23:17:04 wez Exp $
+# $Id: Makefile,v 1.2 2003/12/03 14:55:03 wez Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -43,7 +43,7 @@
flex -i -SZend/flex.skl -Pzend -oZend/zend_language_scanner.c
Zend/zend_language_scanner.l
$(BUILD_DIR)\$(PHPDLL): $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS)
- $(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(PHP_GLOBAL_OBJS)
$(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS)
+ $(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS)
$(STATIC_EXT_LDFLAGS) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS)
$(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
Index: php-src/win32/build/buildconf.js
diff -u php-src/win32/build/buildconf.js:1.1 php-src/win32/build/buildconf.js:1.2
--- php-src/win32/build/buildconf.js:1.1 Tue Dec 2 18:17:04 2003
+++ php-src/win32/build/buildconf.js Wed Dec 3 09:55:03 2003
@@ -1,4 +1,4 @@
-// $Id: buildconf.js,v 1.1 2003/12/02 23:17:04 wez Exp $
+// $Id: buildconf.js,v 1.2 2003/12/03 14:55:03 wez Exp $
/*
+----------------------------------------------------------------------+
| PHP Version 5 |
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: buildconf.js,v 1.1 2003/12/02 23:17:04 wez Exp $ */
+/* $Id: buildconf.js,v 1.2 2003/12/03 14:55:03 wez Exp $ */
// This generates a configure script for win32 build
WScript.StdOut.WriteLine("Rebuilding configure.js");
@@ -49,6 +49,13 @@
}
}
+if (FSO.FileExists("ZendEngine2\\OBJECTS2_HOWTO")) {
+ if (FSO.FolderExists("Zend")) {
+ FSO.MoveFolder("Zend", "ZendEngine1");
+ }
+ FSO.MoveFolder("ZendEngine2", "Zend");
+}
+
// Write the head of the configure script
C.WriteLine("/* This file automatically generated from win32/build/confutils.js */");
C.Write(file_get_contents("win32/build/confutils.js"));
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.5 php-src/win32/build/confutils.js:1.6
--- php-src/win32/build/confutils.js:1.5 Wed Dec 3 09:29:45 2003
+++ php-src/win32/build/confutils.js Wed Dec 3 09:55:03 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.5 2003/12/03 14:29:45 wez Exp $
+// $Id: confutils.js,v 1.6 2003/12/03 14:55:03 wez Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -473,7 +473,7 @@
if (shared) {
dllname = "php_" + extname + ".dll";
MFO.WriteLine("$(BUILD_DIR)\\" + dllname + ": $(" + EXT +
"_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB)");
- MFO.WriteLine("\t$(LD) /out:$(BUILD_DIR)\\" + dllname + "
$(DLL_LDFLAGS) $(LDFLAGS) $(" + EXT + "_LDFLAGS) $(" + EXT + "_GLOBAL_OBJS)
$(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + EXT + ") $(LIBS)");
+ MFO.WriteLine("\t$(LD) /out:$(BUILD_DIR)\\" + dllname + "
$(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_" + EXT + ") $(" + EXT + "_GLOBAL_OBJS)
$(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + EXT + ") $(LIBS)");
MFO.WriteBlankLines(1);
ADD_FLAG("EXT_TARGETS", dllname);
@@ -483,6 +483,7 @@
} else {
ADD_FLAG("STATIC_EXT_OBJS", "$(" + EXT + "_GLOBAL_OBJS)");
ADD_FLAG("STATIC_EXT_LIBS", "$(LIBS_" + EXT + ")");
+ ADD_FLAG("STATIC_EXT_LDFLAGS", "$(LDFLAGS_" + EXT + ")");
ADD_FLAG("CFLAGS_" + EXT, "$(CFLAGS_PHP)");
/* find the header that declars the module pointer,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
