mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 12:03:31 +01:00
defs.mk: (hopefully) making use of INSTALLED_DEF in mingw builds
This commit is contained in:
parent
00cc2274fa
commit
2b68d0d9e4
1 changed files with 1 additions and 1 deletions
|
|
@ -262,7 +262,6 @@ LINKS_SO += $(shell echo $(LIB_SO) | sed -e "s/\.so\..*$$/.so/" | g
|
|||
INSTALLED_LINKS_SO += $(shell echo $(INSTALLED_LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
|
||||
INSTALLED_LIB_SO = $(INSTALL_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
|
||||
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
|
||||
INSTALLED_DEF = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.lib *.def *.exp))
|
||||
else
|
||||
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
|
||||
SO_SUFFIX = dll
|
||||
|
|
@ -272,6 +271,7 @@ LIB_SO = $(BUILD_LIBDIR)/$(LIBNAME).dll
|
|||
INSTALLED_LIB_SO = $(INSTALL_LIBDIR)/$(LIBNAME).$(SO_SUFFIX)
|
||||
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
|
||||
endif
|
||||
INSTALLED_DEF = $(addprefix $(INSTALL_LIBDIR)/,$(wildcard *.lib *.def *.exp))
|
||||
INSTALLED_LIB += $(addprefix $(INSTALL_LIBDIR)/,$(LOCAL_LIBS))
|
||||
BUILD_LIB += $(addprefix $(BUILD_LIBDIR)/,$(LOCAL_LIBS))
|
||||
INSTALLED_SHOBJS += $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue