Browse Source

fix /mp usage for VC++

pull/872/head
Anatol Belski 12 years ago
parent
commit
892efcfc3d
  1. 3
      win32/build/config.w32
  2. 4
      win32/build/confutils.js

3
win32/build/config.w32

@ -167,13 +167,16 @@ if (VCVERS >= 1400) {
}
ARG_WITH('mp', 'Tell Visual Studio use up to [n,auto,disable] processes for compilation', 'auto');
var PHP_MP_DISABLED = true;
if (VCVERS >= 1500 && PHP_MP != 'disable') {
// no from disable-all
if(PHP_MP == 'auto' || PHP_MP == 'no') {
ADD_FLAG('CFLAGS', ' /MP ');
PHP_MP_DISABLED = false;
} else {
if(parseInt(PHP_MP) != 0) {
ADD_FLAG('CFLAGS', ' /MP'+ PHP_MP +' ');
PHP_MP_DISABLED = false;
} else {
STDOUT.WriteLine('WARNING: Invalid argument for MP: ' + PHP_MP);
}

4
win32/build/confutils.js

@ -1429,7 +1429,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir)
obj = src.replace(re, ".obj");
tv += " " + sub_build + obj;
if (!MODE_PHPIZE && PHP_ONE_SHOT == "yes") {
if (!MODE_PHPIZE && !PHP_MP_DISABLED) {
if (i > 0) {
objs_line += " " + sub_build + obj;
srcs_line += " " + dir + "\\" + src;
@ -1448,7 +1448,7 @@ function ADD_SOURCES(dir, file_list, target, obj_dir)
}
}
if (!MODE_PHPIZE && PHP_ONE_SHOT == "yes") {
if (!MODE_PHPIZE && !PHP_MP_DISABLED) {
MFO.WriteLine(objs_line + ": " + srcs_line);
MFO.WriteLine("\t$(CC) $(" + flags + ") $(CFLAGS) /Fo" + sub_build + " $(" + bd_flags_name + ") /c " + srcs_line);
}

Loading…
Cancel
Save