diff --git a/src/conio/Common.make b/src/conio/Common.make index 9601b07dbeb1096abbbede6c18282f247c7f3a3d..4aada172800f89abe114879f62d0c6725d71873f 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 bcbf85616d35a099ef1d9eb9277296633e367950..6350472c617c5fb44dc67c47e1c9208c6a176e91 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 c6545f88a03c624fb115672395c96d248071d6b9..613fa91176677704decacbf9ec92119cf402097b 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 efb82b8c5469f70e62ef45181a1ba23b0cd48420..9fdc34eb871e6986d760b9c6ef2084511e67bfcc 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)