epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Changes to allow LOADABLE_LIBRARY to work for borland and MS compilers.

Browse Source
This commit is contained in:
Janet B. Anderson
2008-07-03 15:02:15 +00:00
parent 37d6265427
commit f6f07be763
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure/os/CONFIG.Common.UnixCommon
View File

@@ -77,10 +77,8 @@ PRODDIR_LDFLAGS += $(PROD_DEPLIB_DIRS:%=-L%)
# Link definitions
LINK.cpp = $(CCC) -o $@ $(STATIC_LDFLAGS) $(PRODDIR_LDFLAGS) $(LDFLAGS)
LINK.cpp += $(PROD_LDFLAGS) $(PROD_LD_OBJS) $(PROD_LD_RESS) $(PROD_LDLIBS)
LINK.shrlib = $(CCC) -o $@ $(SHRLIB_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS)
LINK.shrlib = $(CCC) -o $@ $(TARGET_LIB_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS)
LINK.shrlib += $(LIB_LDFLAGS) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
LINK.loadable_shrlib = $(CCC) -o $@ $(LOADABLE_SHRLIB_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS)
LINK.loadable_shrlib += $(LIB_LDFLAGS) $(LIBRARY_LD_OBJS) $(LIBRARY_LD_RESS) $(SHRLIB_LDLIBS)
#--------------------------------------------------
# Operating system definitions

2
configure/os/CONFIG.linux-x86-borland.linux-x86-borland
View File

@@ -223,6 +223,6 @@ LINK.cpp += $(PROD_LDFLAGS) borinit.o /usr/lib/crt1.o $(PROD_LD_OBJS)
LINK.cpp += , $@ ,,$(LINKLIBS) $(PROD_LDLIBS)
LINK.shrlib = $(WINLINK) $(STATIC_LDFLAGS) $(SHRLIBDIR_LDFLAGS) $(LDFLAGS) -Tpd -Gi
LINK.shrlib+= $(LIB_LDFLAGS) borinitso.o $(LIBRARY_LD_OBJS)
LINK.shrlib+= $(TARGET_LIB_LDFLAGS) borinitso.o $(LIBRARY_LD_OBJS)
LINK.shrlib+= , $@ ,,$(LINKLIBS) $(SHRLIB_LDLIBS)

4
configure/os/CONFIG.win32-x86-borland.win32-x86-borland
View File

@@ -13,8 +13,6 @@ VALID_BUILDS = Host Ioc
#-------------------------------------------------------
BUILD_LIBRARY += $(LOADABLE_BUILD_LIBRARY)
BORLAND_INC = $(BORLAND)\\include
BORLAND_LIB = $(BORLAND)\\lib
BORLAND_BIN = $(BORLAND)\\bin
@@ -162,6 +160,7 @@ ARCH_DEP_CFLAGS=
# is: WIN32, sun4, hpux, linux, ...
#
OS_CLASS=WIN32
POSIX=NO
# ifdef WIN32 looks better that ifeq ($(OS_CLASS),WIN32) ??
WIN32=1
@@ -210,6 +209,7 @@ LINK.shrlib+= $(DLL_DEF_FLAG),$(LIBRARY_LD_RESS)
# on some archs), don't define (and build) any library!
SHRLIB_SUFFIX=.dll
SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
# When SHARED_LIBRARIES is YES we are building a DLL link library

4
configure/os/CONFIG.win32-x86.win32-x86
View File

@@ -16,8 +16,6 @@ PATH_FILTER = $(subst /,\\,$(1))
#-------------------------------------------------------
BUILD_LIBRARY += $(LOADABLE_BUILD_LIBRARY)
#
# "\ " forces gnu make to keep this as one token
#
@@ -171,6 +169,7 @@ SHRLIB_CFLAGS=
# is: WIN32, sun4, hpux, linux, ...
#
OS_CLASS=WIN32
POSIX=NO
# ifdef WIN32 looks better that ifeq ($(OS_CLASS),WIN32) ??
WIN32=1
@@ -226,6 +225,7 @@ MUNCH_CMD = $(CCC) /Fo $@ $^
# on some archs), don't define (and build) any library!
SHRLIB_SUFFIX=.dll
SHRLIBNAME_YES = $(BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
LOADABLE_SHRLIBNAME = $(LOADABLE_BUILD_LIBRARY:%=%$(SHRLIB_SUFFIX))
#
# When SHARED_LIBRARIES is YES we are building a DLL link library