com php-src: either ms or intel linker is used, /libpath is supported: win32/build/config.w32
| From: | Anatol Belski | Date: | Fri, 07 Nov 2014 17:39:03 +0000 |
| Subject: | com php-src: either ms or intel linker is used, /libpath is supported: win32/build/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82987@lists.php.net to get a copy of this message | ||
Commit: 2e5cba25e8fa7e980746d0111c0740fdd4002b74
Author: Anatol Belski <ab@php.net> Fri, 7 Nov 2014 18:39:03 +0100
Parents: fc734cf95da914aa0f6eac0b8ceeb1c1d9fcdf69
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2e5cba25e8fa7e980746d0111c0740fdd4002b74
Log:
either ms or intel linker is used, /libpath is supported
Changed paths:
M win32/build/config.w32
Diff:
diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 81a7bd9..ebe8011 100644
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -232,12 +232,10 @@ function add_extra_dirs()
for (i = 0; i < path.length; i++) {
f = FSO.GetAbsolutePathName(path[i]);
if (FSO.FolderExists(f)) {
- if (VS_TOOLSET) {
- if (VCVERS <= 1200 && f.indexOf(" ") >= 0) {
- ADD_FLAG("LDFLAGS", '/libpath:"\\"' + f + '\\""
');
- } else {
- ADD_FLAG("LDFLAGS", '/libpath:"' + f + '" ');
- }
+ if (VS_TOOLSET && VCVERS <= 1200 && f.indexOf(" ") >= 0) {
+ ADD_FLAG("LDFLAGS", '/libpath:"\\"' + f + '\\""
');
+ } else {
+ ADD_FLAG("LDFLAGS", '/libpath:"' + f + '" ');
}
}
}