From 1e9e38e9bca0605ffbd7f9c0384611a49f1a464e Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Sun, 12 Sep 2004 23:42:04 +0000
Subject: [PATCH] Use LIBNAME-MT_* instead of LIBNAME_MT_*

---
 src/conio/Common.make | 6 +++---
 src/conio/GNUmakefile | 2 +-
 src/conio/Makefile    | 6 +++---
 src/conio/targets.mk  | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/conio/Common.make b/src/conio/Common.make
index 9601b07dbe..4aada17280 100644
--- a/src/conio/Common.make
+++ b/src/conio/Common.make
@@ -1,4 +1,4 @@
-CIOLIB	=	$(CONIO_SRC)$(DIRSEP)$(LIBODIR)$(DIRSEP)$(LIBPREFIX)ciolib$(LIBFILE)
+CIOLIB-MT	=	$(CONIO_SRC)$(DIRSEP)$(LIBODIR)$(DIRSEP)$(LIBPREFIX)ciolib$(LIBFILE)
 
-CIOLIB_CFLAGS	=	-I$(CIOLIB_SRC)
-CIOLIB_LDFLAGS	=	-L$(CIOLIB_SRC)$(DIRSEP)$(LIBODIR)
+CIOLIB-MT_CFLAGS	=	-I$(CIOLIB_SRC)
+CIOLIB-MT_LDFLAGS	=	-L$(CIOLIB_SRC)$(DIRSEP)$(LIBODIR)
diff --git a/src/conio/GNUmakefile b/src/conio/GNUmakefile
index bcbf85616d..6350472c61 100644
--- a/src/conio/GNUmakefile
+++ b/src/conio/GNUmakefile
@@ -27,7 +27,7 @@ endif
 
 
 # CIOLIB Library Link Rule
-$(CIOLIB): $(OBJS)
+$(CIOLIB-MT): $(OBJS)
 	@echo Creating $@ ...
 	$(QUIET)ar rc $@ $^
 	$(QUIET)ranlib $@
diff --git a/src/conio/Makefile b/src/conio/Makefile
index c6545f88a0..613fa91176 100644
--- a/src/conio/Makefile
+++ b/src/conio/Makefile
@@ -21,11 +21,11 @@ SRC_ROOT = ..
 # Cross platform/compiler definitions
 !include ..\build\Common.bmake	# defines clean and output directory rules
 
-CFLAGS = $(CFLAGS) -I$(XPDEV_SRC) -I$(CIOLIB_SRC)
+CFLAGS = $(CFLAGS) $(XPDEV-MT_CFLAGS) $(MT_CFLAGS) -I$(CIOLIB_SRC)
 
 # SBBS DLL Link Rule
-$(CIOLIB): $(OBJS)
-    @echo Creating $< ...
+$(CIOLIB-MT): $(OBJS)
+    @echo Creating $<
 	-$(QUIET)$(DELETE) $@
 	$(QUIET)for %f in ($(OBJS)) do $(QUIET)tlib $@ +%f
 
diff --git a/src/conio/targets.mk b/src/conio/targets.mk
index efb82b8c54..9fdc34eb87 100644
--- a/src/conio/targets.mk
+++ b/src/conio/targets.mk
@@ -1,3 +1,3 @@
 # conio/targets.mk
-CIOLIB	=	$(LIBODIR)$(DIRSEP)$(LIBPREFIX)ciolib$(LIBFILE)
-default: $(OBJODIR) $(LIBODIR) $(CIOLIB)
+CIOLIB-MT	=	$(LIBODIR)$(DIRSEP)$(LIBPREFIX)ciolib-mt$(LIBFILE)
+default: $(OBJODIR) $(LIBODIR) $(CIOLIB-MT)
-- 
GitLab