diff options
| author | Anatol Belski <ab@php.net> | 2014-07-18 18:40:09 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-18 18:40:09 +0200 |
| commit | 982342b057d6ef811367ff804751d0d901a529b7 (patch) | |
| tree | 44d5d4735a1b3612f3f95bf91ee45404e86f63a0 | |
| parent | f304fb848fa63c693df92a67a5f1066da060e8f3 (diff) | |
| parent | c5ccaf1d04fe20dc117b81764041c47efcb9b156 (diff) | |
| download | php-git-982342b057d6ef811367ff804751d0d901a529b7.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
implemented copy libs of core exts in phpize mode
| -rw-r--r-- | win32/build/Makefile | 2 | ||||
| -rw-r--r-- | win32/build/confutils.js | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 057b584549..7a3be93e87 100644 --- a/win32/build/Makefile +++ b/win32/build/Makefile @@ -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 diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 64d40e9b58..3cb11f0642 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1967,8 +1967,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();
|