diff options
author | Anatol Belski <ab@php.net> | 2014-11-07 18:39:03 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2014-11-07 18:39:03 +0100 |
commit | 2e5cba25e8fa7e980746d0111c0740fdd4002b74 (patch) | |
tree | d87e8405e9f66f85bcfd1870b6da5535120965b9 | |
parent | fc734cf95da914aa0f6eac0b8ceeb1c1d9fcdf69 (diff) | |
download | php-git-2e5cba25e8fa7e980746d0111c0740fdd4002b74.tar.gz |
either ms or intel linker is used, /libpath is supported
-rw-r--r-- | win32/build/config.w32 | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 81a7bd901a..ebe8011148 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 + '" '); } } } |