From f12b3118a3556235ea671406693ba4fd7c4e62f0 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Sun, 12 Sep 2004 21:47:03 +0000
Subject: [PATCH] Add MTOBJODIR and implcicit rules for MT objects
---
src/build/Common.bmake | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/build/Common.bmake b/src/build/Common.bmake
index 505b0b8b58..32d1475e49 100644
--- a/src/build/Common.bmake
+++ b/src/build/Common.bmake
@@ -165,8 +165,9 @@ BUILDPATH = debug
BUILDPATH = release
!endif
+OBJODIR = $(CCPRE).win32.obj.$(BUILDPATH)
+MTOBJODIR = $(CCPRE).win32.obj.$(BUILDPATH)-mt
LIBODIR = $(CCPRE).win32.lib.$(BUILDPATH)
-OBJODIR = $(CCPRE).win32.obj.$(BUILDPATH)$(OBJPATH_SUFFIX)
EXEODIR = $(CCPRE).win32.exe.$(BUILDPATH)
# Paths
@@ -189,9 +190,17 @@ UIFC_SRC = $(SRC_ROOT)$(DIRSEP)uifc
#!include libobjs.mk # defines $(LIB_OBJS)
# Implicit C Compile Rule
-{.}.c$(OFILE):
+{.}.c${OBJODIR}$(OFILE):
@$(CC) $(CFLAGS) $(CCFLAGS) -c $< $(OUTPUT)$@
# Implicit C++ Compile Rule
-{.}.cpp$(OFILE):
+{.}.cpp{OBJODIR}$(OFILE):
@$(CC) $(CFLAGS) $(CXXFLAGS) -c $< $(OUTPUT)$@
+
+# Implicit MT C Compile Rule
+{.}.c{MTOBJODIR}$(OFILE):
+ @$(CC) $(CFLAGS) $(CCFLAGS) $(PTHREAD_CFLAGS) -c $< $(OUTPUT)$@
+
+# Implicit MT C++ Compile Rule
+{.}.cpp{MTOBJODIR}$(OFILE):
+ @$(CC) $(CFLAGS) $(CXXFLAGS) $(PTHREAD_CFLAGS) -c $< $(OUTPUT)$@
--
GitLab