From 7f6d8e2822e4a0c221589556bcff67a633357e81 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Thu, 26 Mar 1998 17:19:01 +0000 Subject: [PATCH] DLL_LIBS definition and changed LINK.cc definition. --- config/CONFIG.Host.WIN32 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/CONFIG.Host.WIN32 b/config/CONFIG.Host.WIN32 index 20d517b22..e4deeb0be 100644 --- a/config/CONFIG.Host.WIN32 +++ b/config/CONFIG.Host.WIN32 @@ -212,6 +212,10 @@ PROD_DEPLIBS = $(foreach lib,$(PROD_LIBS),$(firstword $($(lib)_DIR) $(EPICS_BASE USR_DEPLIBS = $(foreach lib,$(USR_LIBS),$(firstword $($(lib)_DIR) $(EPICS_BASE_LIB))/$(lib).lib) +# by default the libraries used when linking the DLL are just +# PROD_LIBS ans SYS_PROD_LIBS minus the DLL name +DLL_LIBS = $(subst $(LIBRARY),, $(PROD_LIBS)) + # # EPICS libs that we need to link the DLL with # (it isnt necessary to rebuild the dll if these change) @@ -222,7 +226,7 @@ USR_LDLIBS = $(PRODNAME_DEPLIBS) $(PROD_DEPLIBS) $(USR_DEPLIBS) $(SYS_PROD_LIBS: DLL_LDLIBS = $(DLL_DEPLIBS) $(SYS_PROD_LIBS:%=%.lib) $(OP_SYS_LDLIBS) LINK.c = $(WINLINK) -nologo $(LDFLAGS) -out:$@ -LINK.cc = $(LINK.c) +LINK.cc = $(WINLINK) -nologo $(LDFLAGS) -out:$@ #-------------------------------------------------- # Determine ld flags