mirror of
https://github.com/php/php-src.git
synced 2024-11-25 10:54:15 +08:00
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: implemented copy libs of core exts in phpize mode
This commit is contained in:
commit
47e640164a
@ -183,7 +183,7 @@ msi-installer: dist
|
||||
# need to redirect, since INSTALL is a file in the root...
|
||||
install: really-install install-sdk
|
||||
|
||||
build-lib:
|
||||
build-lib: build-ext-libs
|
||||
@if not exist $(BUILD_DIR_DEV)\lib mkdir $(BUILD_DIR_DEV)\lib >nul
|
||||
@copy $(BUILD_DIR)\$(PHPLIB) $(BUILD_DIR_DEV)\lib /y >nul
|
||||
|
||||
|
@ -1988,8 +1988,18 @@ function generate_makefile()
|
||||
for (var i in extensions_enabled) {
|
||||
var lib = "php_" + extensions_enabled[i][0] + ".lib";
|
||||
var dll = "php_" + extensions_enabled[i][0] + ".dll";
|
||||
MF.WriteLine(" @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib\\" + lib);
|
||||
MF.WriteLine(" @copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)\\" + dll);
|
||||
MF.WriteLine(" @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");
|
||||
MF.WriteLine(" @copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)");
|
||||
}
|
||||
} else {
|
||||
MF.WriteBlankLines(1);
|
||||
MF.WriteLine("build-ext-libs:");
|
||||
for (var i in extensions_enabled) {
|
||||
var lib = "php_" + extensions_enabled[i][0] + ".lib";
|
||||
|
||||
if ('shared' == extensions_enabled[i][1]) {
|
||||
MF.WriteLine(" @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");
|
||||
}
|
||||
}
|
||||
}
|
||||
TF.Close();
|
||||
|
Loading…
Reference in New Issue
Block a user