mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-24 14:50:38 +01:00
defs.mk, rules.mk: Link import dlls via MS_LD alias wine lib.exe
This commit is contained in:
parent
1ab6425074
commit
f37e3bb371
2 changed files with 9 additions and 2 deletions
|
|
@ -64,6 +64,7 @@ GPP = $(CROSS_TOOL_BIN_PREFIX)g++
|
|||
STRIP = $(CROSS_TOOL_BIN_PREFIX)strip
|
||||
LDFLAGS += -lws2_32
|
||||
USE_GFILTER = false
|
||||
MS_LD ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE
|
||||
else
|
||||
GCC = gcc
|
||||
GPP = g++
|
||||
|
|
@ -197,6 +198,8 @@ SO_SUFFIX = so.$(shell echo $(VERSION) | cut -d- -f1)
|
|||
LIB_SO = $(LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
|
||||
else
|
||||
LIB_A = $(LIBDIR)/lib$(LIBNAME)-static.a
|
||||
LIB_DEF = $(LIBDIR)/$(LIBNAME).def
|
||||
MSVCPP_IMPLIB = $(LIBDIR)/$(LIBNAME).lib
|
||||
SO_SUFFIX = dll.$(shell echo $(VERSION) | cut -d- -f1)
|
||||
LIB_SO = $(LIBDIR)/$(LIBNAME).dll
|
||||
endif
|
||||
|
|
@ -453,3 +456,4 @@ endif
|
|||
NEW_LD_LIB_PATH = $(shell echo $(LDFLAGS) | sed 's/-[^L][^ ]*//g; s/-L[ ]*\([^ ]*\)[ ]*/\1:/g')
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue