diff options
| author | Anatol Belski <ab@php.net> | 2014-07-18 11:39:38 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-18 11:39:38 +0200 |
| commit | 35b077f53e0f8a1debc8bbacf1328b40c62099ab (patch) | |
| tree | e0a9649442f8abd5f76eb9be2d2ba9d6eccdddd4 | |
| parent | 8044d0680ba03a08b5d4daa61e6b0b20d1ac30c0 (diff) | |
| download | php-git-35b077f53e0f8a1debc8bbacf1328b40c62099ab.tar.gz | |
fix copy the ext dll into the prefix path in phpize mode
| -rw-r--r-- | win32/build/confutils.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 1c61316fb9..3de57a9963 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1347,9 +1347,6 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) if (MODE_PHPIZE && FSO.FileExists(PHP_DIR + "/include/main/config.pickle.h")) {
cflags = "/FI main/config.pickle.h " + cflags;
}
- if (MODE_PHPIZE && FSO.FileExists(PHP_DIR + "/include/main/config.pickle.h")) {
- cflags = "/FI main/config.pickle.h " + cflags;
- }
ADD_FLAG("CFLAGS_" + EXT, cflags);
if (PHP_DSP != "no") {
@@ -1869,6 +1866,7 @@ function generate_phpize() var MF = FSO.CreateTextFile(dest + "/phpize.js", true);
var DEPS = FSO.CreateTextFile(dest + "/ext_deps.js", true);
+
prefix = get_define("PHP_PREFIX");
prefix = prefix.replace(new RegExp("/", "g"), "\\");
prefix = prefix.replace(new RegExp("\\\\", "g"), "\\\\");
@@ -1955,7 +1953,7 @@ function generate_makefile() 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)\\" + dll + " $(PHP_PREFIX)\\" + dll);
}
}
TF.Close();
|