Windows: Support older compilers that don't do parallel builds

This commit is contained in:
Asanka C. Herath
2010-11-18 20:51:09 -05:00
parent 82a200bfa2
commit ff404ecaae
2 changed files with 14 additions and 7 deletions

View File

@@ -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 $<

View File

@@ -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) @<<
$<
<<