From b9b4948d29882387389e9c85841fe56a6d675225 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Sun, 12 Sep 2004 23:51:42 +0000
Subject: [PATCH] Create separate MT and non-MT libs. Add mtlib and lib targets

---
 src/uifc/Common.make |  4 +++-
 src/uifc/GNUmakefile | 14 +++++++++++---
 src/uifc/objects.mk  |  6 ++++--
 src/uifc/targets.mk  |  5 +++--
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/uifc/Common.make b/src/uifc/Common.make
index 0cfecbbcff..fd35a2699a 100644
--- a/src/uifc/Common.make
+++ b/src/uifc/Common.make
@@ -1,5 +1,7 @@
 UIFCLIB  =       $(CONIO_SRC)$(DIRSEP)$(LIBODIR)$(DIRSEP)$(LIBPREFIX)uifc$(LIBFILE)
+UIFCLIB-MT  =       $(CONIO_SRC)$(DIRSEP)$(LIBODIR)$(DIRSEP)$(LIBPREFIX)uifc-mt$(LIBFILE)
 
 UIFC_CFLAGS   =       -I$(UIFC_SRC)
 UIFC_LDFLAGS  =       -L$(UIFC_SRC)$(DIRSEP)$(LIBODIR)
-
+UIFC-MT_CFLAGS   =       -I$(UIFC_SRC)
+UIFC-MT_LDFLAGS  =       -L$(UIFC_SRC)$(DIRSEP)$(LIBODIR)
diff --git a/src/uifc/GNUmakefile b/src/uifc/GNUmakefile
index a4780393e6..ee3d2429c3 100644
--- a/src/uifc/GNUmakefile
+++ b/src/uifc/GNUmakefile
@@ -17,11 +17,19 @@ SRC_ROOT = ..
 # Cross platform/compiler definitions
 include $(SRC_ROOT)/build/Common.gmake	# defines clean and output directory rules
 
-CFLAGS += -I$(XPDEV_SRC) $(CIOLIB_CFLAGS)
+CFLAGS += -I$(XPDEV_SRC) $(CIOLIB-MT_CFLAGS)
+
+lib: $(LIBODIR) $(UIFCLIB)
+mtlib: $(LIBODIR) $(UIFCLIB-MT)
 
 # UIFC Library Link Rule
-$(UIFCLIB): $(OBJS)
+$(UIFCLIB): $(OBJODIR) $(OBJS)
 	@echo Creating $@ ...
-	$(QUIET)ar rc $@ $^
+	$(QUIET)ar rc $@ $(OBJS)
 	$(QUIET)ranlib $@
 
+# MT-UIFC Library Link Rule
+$(UIFCLIB-MT): $(MTOBJODIR) $(MT_OBJS)
+	@echo Creating $@ ...
+	$(QUIET)ar rc $@ $(MT_OBJS)
+	$(QUIET)ranlib $@
diff --git a/src/uifc/objects.mk b/src/uifc/objects.mk
index b9a20c2abf..ec65f498a0 100644
--- a/src/uifc/objects.mk
+++ b/src/uifc/objects.mk
@@ -1,2 +1,4 @@
-OBJS = $(OBJODIR)$(DIRSEP)uifc32$(OFILE) \
-       $(OBJODIR)$(DIRSEP)uifcx$(OFILE)
+OBJS = $(OBJODIR)$(DIRSEP)uifcx$(OFILE)
+
+MT_OBJS = $(MTOBJODIR)$(DIRSEP)uifc32$(OFILE) \
+       $(MTOBJODIR)$(DIRSEP)uifcx$(OFILE)
diff --git a/src/uifc/targets.mk b/src/uifc/targets.mk
index 98e3afb1be..0984f64ecb 100644
--- a/src/uifc/targets.mk
+++ b/src/uifc/targets.mk
@@ -1,2 +1,3 @@
-UIFCLIB	=	$(LIBODIR)$(DIRSEP)$(LIBPREFIX)uifc$(LIBFILE)
-all: $(OBJODIR) $(LIBODIR) $(UIFCLIB)
+UIFCLIB		=	$(LIBODIR)$(DIRSEP)$(LIBPREFIX)uifc$(LIBFILE)
+UIFCLIB-MT	=	$(LIBODIR)$(DIRSEP)$(LIBPREFIX)uifc-mt$(LIBFILE)
+all: lib mtlib
-- 
GitLab