cvs: php-src /win32/build Makefile confutils.js
| From: | Dmitry Stogov | Date: | Fri, 10 Nov 2006 10:30:56 +0000 |
| Subject: | cvs: php-src /win32/build Makefile confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-41436@lists.php.net to get a copy of this message | ||
dmitry Fri Nov 10 10:30:56 2006 UTC
Modified files:
/php-src/win32/build Makefile confutils.js
Log:
Use $(CC) for linking instead of $(LD). This allows usage of advansed optimization techniques
(like Intel's inner-procedure optimization)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/Makefile?r1=1.38&r2=1.39&diff_format=u
Index: php-src/win32/build/Makefile
diff -u php-src/win32/build/Makefile:1.38 php-src/win32/build/Makefile:1.39
--- php-src/win32/build/Makefile:1.38 Sat Jul 22 13:13:18 2006
+++ php-src/win32/build/Makefile Fri Nov 10 10:30:56 2006
@@ -14,7 +14,7 @@
# | Author: Wez Furlong <wez@thebrainroom.com> |
# +----------------------------------------------------------------------+
#
-# $Id: Makefile,v 1.38 2006/07/22 13:13:18 rrichards Exp $
+# $Id: Makefile,v 1.39 2006/11/10 10:30:56 dmitry Exp $
# This is the makefile template for the win32 build
CC="$(CL)"
@@ -61,7 +61,7 @@
win32\build\template.rc
$(BUILD_DIR)\$(PHPDLL): generated_files $(PHPDEF) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS)
$(PHPDLL_RES) $(MCFILE)
- @$(LD) /out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS)
$(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES)
+ @$(CC) $(PHP_GLOBAL_OBJS) $(STATIC_EXT_OBJS) $(STATIC_EXT_LIBS) $(LIBS) $(PHPDLL_RES) /link
/out:$(BUILD_DIR)\$(PHPDLL) $(PHP_LDFLAGS) $(LDFLAGS) $(STATIC_EXT_LDFLAGS)
$(BUILD_DIR)\$(PHPLIB): $(BUILD_DIR)\$(PHPDLL)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.62&r2=1.63&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.62 php-src/win32/build/confutils.js:1.63
--- php-src/win32/build/confutils.js:1.62 Sun May 7 00:07:53 2006
+++ php-src/win32/build/confutils.js Fri Nov 10 10:30:56 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-// $Id: confutils.js,v 1.62 2006/05/07 00:07:53 edink Exp $
+// $Id: confutils.js,v 1.63 2006/11/10 10:30:56 dmitry Exp $
var STDOUT = WScript.StdOut;
var STDERR = WScript.StdErr;
@@ -578,7 +578,7 @@
path_to_check += ";" + php_usual_lib_suspects;
// It is common practice to put libs under one of these dir names
- var subdirs = new Array(PHP_DEBUG == "yes" ? "Debug" : "Release",
"lib", "libs", "libexec");
+ var subdirs = new Array(PHP_DEBUG == "yes" ? "Debug" : (PHP_DEBUG_PACK ==
"yes"?"Release_Dbg":"Release"), "lib", "libs",
"libexec");
// libnames can be ; separated list of accepted library names
libnames = libnames.split(';');
@@ -665,7 +665,7 @@
var i;
var libname;
- var subdir = PHP_DEBUG == "yes" ? "Debug" : "Release";
+ var subdir = PHP_DEBUG == "yes" ? "Debug" : (PHP_DEBUG_PACK ==
"yes"?"Release_Dbg":"Release");
libnames = libnames.split(';');
for (i = 0; i < libnames.length; i++) {
@@ -876,7 +876,7 @@
var SAPI = sapiname.toUpperCase();
var ldflags;
var resname;
- var ld = "@$(LD)";
+ var ld;
if (typeof(obj_dir) == "undefined") {
sapiname_for_printing = configure_module_dirname;
@@ -915,7 +915,16 @@
ldflags = "$(LDFLAGS)";
}
- MFO.WriteLine("\t" + ld + " /nologo /out:$(BUILD_DIR)\\" + makefiletarget +
" " + ldflags + " $(" + SAPI + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB)
$(LDFLAGS_" + SAPI + ") $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" + resname);
+ if(PHP_VCI = "yes" || PHP_VCO == "yes") {
+ ldflags += " /PGD:$(BUILD_DIR)\\"+makefiletarget+".pgd";
+ }
+
+ if (ld) {
+ MFO.WriteLine("\t" + ld + " /nologo /out:$(BUILD_DIR)\\" + makefiletarget +
" " + ldflags + " $(" + SAPI + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB)
$(LDFLAGS_" + SAPI + ") $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" + resname);
+ } else {
+ ld = "@$(CC)";
+ MFO.WriteLine("\t" + ld + " /nologo " + " $(" + SAPI +
"_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + SAPI + ") $(BUILD_DIR)\\" +
resname + " /link /out:$(BUILD_DIR)\\" + makefiletarget + " " + ldflags + "
$(LDFLAGS_" + SAPI + ")");
+ }
DEFINE('CFLAGS_' + SAPI + '_OBJ', '$(CFLAGS_' + SAPI +
')');
@@ -1031,10 +1040,10 @@
var libname = dllname.substring(0, dllname.length-4) + ".lib";
var resname = generate_version_info_resource(dllname, configure_module_dirname);
- var ld = "@$(LD)";
+ var ld = "@$(CC)";
MFO.WriteLine("$(BUILD_DIR)\\" + dllname + " $(BUILD_DIR)\\" + libname +
": $(DEPS_" + EXT + ") $(" + EXT + "_GLOBAL_OBJS) $(BUILD_DIR)\\$(PHPLIB)
$(BUILD_DIR)\\" + resname);
- MFO.WriteLine("\t" + ld + " /out:$(BUILD_DIR)\\" + dllname + "
$(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_" + EXT + ") $(" + EXT + "_GLOBAL_OBJS)
$(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + EXT + ") $(LIBS) $(BUILD_DIR)\\" + resname);
+ MFO.WriteLine("\t" + ld + " $(" + EXT + "_GLOBAL_OBJS)
$(BUILD_DIR)\\$(PHPLIB) $(LIBS_" + EXT + ") $(LIBS) $(BUILD_DIR)\\" + resname +
" /link /out:$(BUILD_DIR)\\" + dllname + " $(DLL_LDFLAGS) $(LDFLAGS) $(LDFLAGS_"
+ EXT + ")");
MFO.WriteBlankLines(1);
if (configure_module_dirname.match("pecl")) {
@@ -1211,7 +1220,7 @@
continue;
}
last = bd;
- ADD_FLAG("BUILD_DIRS_SUB", bd);
+ ADD_FLAG("BUILD_DIRS_SUB", bd.replace(new RegExp('^'+dir+'\\\\'),
'$(BUILD_DIR)\\'));
if (!FSO.FolderExists(bd)) {
FSO.CreateFolder(bd);
}