mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 03:53:32 +01:00
make: Add support for linking shared libs correctly
This commit is contained in:
parent
fbaa3fbd20
commit
bf5ee92e61
4 changed files with 26 additions and 13 deletions
|
|
@ -144,7 +144,7 @@ CFLAGS += $(CFLAGS_DEBUG)
|
|||
CPPFLAGS += $(CFLAGS_DEBUG)
|
||||
endif
|
||||
|
||||
LIBDIR = $(MODDIR)/lib
|
||||
LIBDIR = $(TOPDIR)/lib
|
||||
INSTALLED_SHOBJS = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS))
|
||||
|
||||
ifeq ($(USE_QT),true)
|
||||
|
|
@ -192,10 +192,14 @@ RM = rm
|
|||
AR = ar
|
||||
ifdef INSTALL_LOG
|
||||
INSTALL=$(MODDIR)/devutil/scripts/log_install.sh -l $(INSTALL_LOG)
|
||||
LINK_LIB=$(MODDIR)/devutil/scripts/log_install.sh -L -l $(INSTALL_LOG)
|
||||
else
|
||||
ifndef INSTALL
|
||||
INSTALL = install
|
||||
endif
|
||||
ifndef LINK_LIB
|
||||
LINK_LIB=$(MODDIR)/devutil/scripts/log_install.sh -L
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue