Changes for win32 resource files.
This commit is contained in:
@@ -15,7 +15,7 @@ CPLUSPLUS = CCC
|
||||
#
|
||||
WINLINK = ilink32
|
||||
|
||||
RCCMD = brcc32 -l0x409 -fo$@ $<
|
||||
RCCMD = brcc32 -i . -i .. -i $(INSTALL_INCLUDE) -i $(EPICS_BASE_INCLUDE) -fo $@ $<
|
||||
|
||||
ARCMD = tlib $@
|
||||
|
||||
|
||||
@@ -300,6 +300,9 @@ ifdef LIBRARY
|
||||
ifdef LIBOBJS
|
||||
LIBTARGETS += $(LIBNAME) $(INSTALL_LIBS)
|
||||
|
||||
LIBNAME_RCS=$(foreach lib, $(basename $(LIBRARY)), $(RCS) $($(lib)_RCS) $($(lib)_RCS_$(ARCH_CLASS)))
|
||||
LIBNAME_RESS=$(addsuffix $(RES), $(basename $(LIBNAME_RCS)))
|
||||
|
||||
ifneq ($(words $(DLL_LIBS)), $(words $(DLL_DEPLIBS)))
|
||||
# If invalid library names, don't make DLL file
|
||||
SHARED_LIBRARIES = NO
|
||||
@@ -677,12 +680,12 @@ endif
|
||||
endif
|
||||
|
||||
ifeq ($(HOST_ARCH),Borland)
|
||||
$(DLL_LINK_LIBNAME) $(SHRLIBNAME): $(LIBOBJS)
|
||||
$(LINK.shrlib) $(LIBOBJS) , $@ ,,$(LINKLIBS) $(subst /,\\,$(DLL_LDLIBS))
|
||||
$(DLL_LINK_LIBNAME) $(SHRLIBNAME): $(LIBOBJS) $(LIBNAME_RESS)
|
||||
$(LINK.shrlib) $(LIBOBJS) , $@ ,,$(LINKLIBS) $(subst /,\\,$(DLL_LDLIBS)), $(DLL_DEF_FLAG), $(LIBNAME_RESS)
|
||||
|
||||
else
|
||||
$(DLL_LINK_LIBNAME) $(SHRLIBNAME): $(LIBOBJS)
|
||||
$(LINK.shrlib) $(LIBOBJS) $(DLL_LDLIBS)
|
||||
$(DLL_LINK_LIBNAME) $(SHRLIBNAME): $(LIBOBJS) $(LIBNAME_RESS)
|
||||
$(LINK.shrlib) $(LIBOBJS) $(DLL_LDLIBS) $(LIBNAME_RESS)
|
||||
|
||||
endif
|
||||
ifeq ($(HOST_ARCH),Borland)
|
||||
|
||||
Reference in New Issue
Block a user