diff --git a/config/CONFIG.WIN32 b/config/CONFIG.WIN32 index 284b633ea..7a0b967a2 100644 --- a/config/CONFIG.WIN32 +++ b/config/CONFIG.WIN32 @@ -90,7 +90,7 @@ OP_SYS_FLAGS = -MDd -VMG -VMV -DWIN32 -D_WIN32 -D_WINDOWS \ HOST_LDLIBS = user32.lib kernel32.lib wsock32.lib advapi32.lib winmm.lib -HOST_LDFLAGS = -nologo -libpath:$(EPICS_BASE_LIB) +HOST_LDFLAGS = -nologo # Files and flags needed to link DLLs (used in RULES.Host) # diff --git a/config/RULES.Host b/config/RULES.Host index 9fc92412d..c3ad5c1e4 100644 --- a/config/RULES.Host +++ b/config/RULES.Host @@ -195,7 +195,7 @@ ifeq ($(LIBTYPE),SHARED) # create name for dll, import file DLLNAME:=$(LIBRARY).dll # libs defined that we need to link the DLL with? -DLL_DEP_LIBS:=$(DLL_LIBS:%=%.lib) +DLL_DEP_LIBS:=$(DLL_LIBS:%=$(INSTALL_LIB)/%.lib) endif # LIBTYPE=SHARED endif # WIN32 @@ -209,7 +209,7 @@ ifdef PROD_LIBS ifdef WIN32 PRODDEPLIBS:=$(PROD_LIBS:%=$(INSTALL_LIB)/%.lib) -USR_LDLIBS += -libpath:$(INSTALL_LIB) $(PROD_LIBS:%=%.lib) +USR_LDLIBS += $(PROD_LIBS:%=$(INSTALL_LIB)/%.lib) else # On Unix: library "ca" is linked with "-lca" etc. PRODDEPLIBS=$(PROD_LIBS:%=$(INSTALL_LIB)/lib%.a) @@ -225,7 +225,6 @@ ifdef SYS_PROD_LIBS ifdef WIN32 # add to USR_LDLIBS so that the libs are linked -# we need the full path because there is no "-L" option on WIN32.... USR_LDLIBS += $(SYSPRODDEPLIBS) else # On Unix: it is difficult to determine where the diff --git a/config/Sample.Makefile.Host b/config/Sample.Makefile.Host index 524226449..d2c2d9ecc 100644 --- a/config/Sample.Makefile.Host +++ b/config/Sample.Makefile.Host @@ -122,7 +122,7 @@ LIBRARY:=libname # if SRCS is undefined, it defaults to $(PROD).c SRCS=a.c b.c c.c -# libs needed to link PROD and TESTPROD +# EPICS libs needed to link PROD and TESTPROD # # for all systems: PROD_LIBS := Com Ca @@ -130,6 +130,14 @@ PROD_LIBS := Com Ca PROD_LIBS_DEFAULT := mathlib PROD_LIBS_WIN32 := -nil- +# system libs needed to link PROD and TESTPROD +# +# for all systems: +SYS_PROD_LIBS := m +# for most systems: +SYS_PROD_LIBS_DEFAULT := foolib +SYS_PROD_LIBS_WIN32 := -nil- + # Product, # may be caRepeater.o -> caRepeater # or caRepeater.obj -> caRepeater.exe