epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fixed WIN32 dll build

Browse Source
This commit is contained in:
Jeff Hill
1998-04-21 00:27:01 +00:00
parent e24a712347
commit ec619b727c
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/CONFIG.Host.WIN32
+11 -1
View File
@@ -204,7 +204,17 @@ LINK.dll = $(WINLINK) /nologo $(WIN32_DLLFLAGS) /implib:$(@:%.dll=%.lib) /out:$@
# on some archs), don't define (and build) any library!
DLLNAME = $(LIBRARY).dll
LIBNAME = $(LIBRARY).lib
#
# Under WIN32 we have the unique situation where the DLL link creates the
# DLL link library xxx.lib and we need to be very careful to avoid replacing
# the xxx.lib created by the dll link with an xxx.lib created by $(AR)
#
# LIBTYPE is empty if we are not building a DLL
#
DLL_LINK_LIBNAME_SHARED = $(LIBRARY).lib
DLL_LINK_LIBNAME = $(DLL_LINK_LIBNAME_$(LIBTYPE))
OBJECT_LIBNAME_ = $(LIBRARY).lib
LIBNAME = $(OBJECT_LIBNAME_$(LIBTYPE))
#--------------------------------------------------
# Dependancy definitions
config/RULES.Host
+3 -2
View File
@@ -232,6 +232,7 @@ INSTALL_PROD= $(PROD:%= $(INSTALL_BIN)/%)
INSTALL_LIBS= $(LIBNAME:%=$(INSTALL_LIB)/%)
INSTALL_SHRLIBS= $(SHRLIBNAME:%=$(INSTALL_LIB)/%)
INSTALL_DLLS=$(DLLNAME:%=$(INSTALL_BIN)/%)
INSTALL_DLL_LINK_LIBS=$(DLL_LINK_LIBNAME:%=$(INSTALL_LIB)/%)
INSTALL_TCLLIBS=$(TCLLIBNAME:%=$(INSTALL_TCLLIB)/%)
INSTALL_TCLINDEX=$(TCLINDEX:%=$(INSTALL_TCLLIB)/%)
@@ -294,9 +295,9 @@ LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS)
ifeq ($(strip $(LIBTYPE)),SHARED)
#
# LIBTYPE=="SHARED" indicates build
# DLL and also build object archive library
# DLL and install both dll and dll link library
#
LIBTARGETS += $(DLLNAME) $(INSTALL_DLLS)
LIBTARGETS += $(DLLNAME) $(INSTALL_DLLS) $(INSTALL_DLL_LINK_LIBS)
endif # LIBTYPE=SHARED
# check if shared library requested: (Unix type build)