diff --git a/src/uifc/Common.make b/src/uifc/Common.make index 0cfecbbcff7f8b7366002e588d470a97d70a49a7..fd35a2699a2705aa46fd0288f9e19eb028379a01 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 a4780393e6c55bd40621d31d11607f3cc469ee1f..ee3d2429c3c8621c679d7c982c7aca7a502599e2 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 b9a20c2abf05511c0f4f7929aa455778ee252917..ec65f498a0984e9f41646737e0e0b963c0c6d318 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 98e3afb1be19ae26edb4e866d7a87dc43493d0b8..0984f64ecba9dc18ccbc3d23031401df2ba5ce45 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