From ff404ecaae76ebb9f29c977bcdf27697f4fa1fb2 Mon Sep 17 00:00:00 2001
From: "Asanka C. Herath" <asanka@secure-endpoints.com>
Date: Thu, 18 Nov 2010 20:51:09 -0500
Subject: [PATCH] Windows: Support older compilers that don't do parallel
 builds

---
 lib/hx509/NTMakefile   |  5 +++--
 windows/NTMakefile.w32 | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/hx509/NTMakefile b/lib/hx509/NTMakefile
index 9e1bbf935..ea5761435 100644
--- a/lib/hx509/NTMakefile
+++ b/lib/hx509/NTMakefile
@@ -243,7 +243,8 @@ clean::
 	-$(RM) $(OBJ)\tool\*.*
 
 {}.c{$(OBJ)\tool}.obj::
-	$(C2OBJ_C) /Fd$(OBJ)\tool\ /Fo$(OBJ)\tool\ /MP /UASN1_LIB $<
+	$(C2OBJ_C) /Fd$(OBJ)\tool\ /Fo$(OBJ)\tool\ $(MPOPT) /UASN1_LIB $<
 
 {$(OBJ)}.c{$(OBJ)\tool}.obj::
-	$(C2OBJ_C) /Fd$(OBJ)\tool\ /Fo$(OBJ)\tool\ /MP /UASN1_LIB $<
+	$(C2OBJ_C) /Fd$(OBJ)\tool\ /Fo$(OBJ)\tool\ $(MPOPT) /UASN1_LIB $<
+
diff --git a/windows/NTMakefile.w32 b/windows/NTMakefile.w32
index c5dc2c14e..2c932234a 100644
--- a/windows/NTMakefile.w32
+++ b/windows/NTMakefile.w32
@@ -194,6 +194,12 @@ libmach=/machine:X64
 !  error Unknown CPU value
 !endif
 
+!ifdef NO_MP
+MPOPT=
+!else
+MPOPT=/MP
+!endif
+
 !ifndef STATICRUNTIME
 
 C2OBJ_C = $(CC) $(cdebug) $(cflags) $(cvarsdll) $(AUXCFLAGS) $(intcflags) $(cdefines) $(cincdirs) $(cwarn)
@@ -216,7 +222,7 @@ LIBGUI_C = $(LM) /nologo $(libmach) /SUBSYSTEM:WINDOWS
 LIBCON_C = $(LM) /nologo $(libmach) /SUBSYSTEM:CONSOLE
 
 C2OBJ = $(C2OBJ_C) -Fo$@ -Fd$(@D)\ $**
-C2OBJ_NP = $(C2OBJ_C) -MP $<
+C2OBJ_NP = $(C2OBJ_C) $(MPOPT) $<
 C2OBJ_P = $(C2OBJ_NP) -Fo$(OBJ)\ -Fd$(OBJ)\ #
 EXECONLINK = $(EXECONLINK_C) -OUT:$@ $**
 EXEGUILINK = $(EXEGUILINK_C) -OUT:$@ $**
@@ -298,22 +304,22 @@ prep:: show-cmds
 !endif				# RECURSE
 
 {}.c{$(OBJ)}.obj::
-	$(C2OBJ_C) /Fd$(OBJ)\ /Fo$(OBJ)\ /MP @<<
+	$(C2OBJ_C) /Fd$(OBJ)\ /Fo$(OBJ)\ $(localcflags) $(MPOPT) @<<
 $<
 <<
 
 {$(OBJ)}.c{$(OBJ)}.obj::
-	$(C2OBJ_C) /Fd$(OBJ)\ /Fo$(OBJ)\ /MP @<<
+	$(C2OBJ_C) /Fd$(OBJ)\ /Fo$(OBJ)\ $(extcflags) $(MPOPT) @<<
 $<
 <<
 
 {}.cpp{$(OBJ)}.obj::
-	$(C2OBJ_C) /Fd$(OBJ)\ /Fo$(OBJ)\ /MP @<<
+	$(C2OBJ_C) /Fd$(OBJ)\ /Fo$(OBJ)\ $(localcflags) $(MPOPT) @<<
 $<
 <<
 
 {$(OBJ)}.cpp{$(OBJ)}.obj::
-	$(C2OBJ_C) /Fd$(OBJ)\ /Fo$(OBJ)\ /MP @<<
+	$(C2OBJ_C) /Fd$(OBJ)\ /Fo$(OBJ)\ $(extcflags) $(MPOPT) @<<
 $<
 <<