From 1f5b18a8949ecfc942dac4c71f2358b955bde2fe Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Sun, 24 Apr 2016 16:29:50 -0400
Subject: build system: PE targets: added import library version support.

---
 project/custom.mk |  3 +++
 project/defs.mk   | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 project/custom.mk

(limited to 'project')

diff --git a/project/custom.mk b/project/custom.mk
new file mode 100644
index 0000000..3a30273
--- /dev/null
+++ b/project/custom.mk
@@ -0,0 +1,3 @@
+ifeq ($(OS_BINFMT),PE)
+include $(PROJECT_DIR)/sysinfo/os/pe.mk
+endif
diff --git a/project/defs.mk b/project/defs.mk
index 5a5d60b..e80bd59 100644
--- a/project/defs.mk
+++ b/project/defs.mk
@@ -14,6 +14,8 @@ APP_OBJS	= $(APP_SRCS:.c=.o)
 SHARED_OBJS	= $(COMMON_LOBJS) $(ARCH_LOBJS)
 STATIC_OBJS	= $(COMMON_OBJS)  $(ARCH_OBJS)
 
+STATIC_LIB	= lib/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_ARCHIVE_EXT)
+
 DSO_VER		= $(OS_LIB_PREFIX)$(PACKAGE)$(OS_LIB_SUFFIX)$(VER_XYZ)
 DSO_SONAME	= $(OS_LIB_PREFIX)$(PACKAGE)$(OS_LIB_SUFFIX)$(VER_SONAME)
 DSO_SOLINK	= $(OS_LIB_PREFIX)$(PACKAGE)$(OS_LIB_SUFFIX)
@@ -22,8 +24,15 @@ SHARED_LIB	= lib/$(DSO_VER)
 SHARED_SONAME	= lib/$(DSO_SONAME)
 SHARED_SOLINK	= lib/$(DSO_SOLINK)
 
-SHARED_IMPLIB	= lib/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_IMPLIB_EXT)
-STATIC_LIB	= lib/$(OS_LIB_PREFIX)$(PACKAGE)$(OS_ARCHIVE_EXT)
+IMP_DEF		= $(OS_LIB_PREFIX)$(PACKAGE)$(VER_XYZ)$(OS_LIBDEF_EXT)
+IMP_VER		= $(OS_LIB_PREFIX)$(PACKAGE)$(VER_XYZ)$(OS_IMPLIB_EXT)
+IMP_SONAME	= $(OS_LIB_PREFIX)$(PACKAGE)$(VER_SONAME)$(OS_IMPLIB_EXT)
+IMP_SOLINK	= $(OS_LIB_PREFIX)$(PACKAGE)$(OS_IMPLIB_EXT)
+
+IMPLIB_DEF	= lib/$(IMP_DEF)
+IMPLIB_VER	= lib/$(IMP_VER)
+IMPLIB_SONAME	= lib/$(IMP_SONAME)
+IMPLIB_SOLINK	= lib/$(IMP_SOLINK)
 
 APP		= bin/$(OS_APP_PREFIX)$(NICKNAME)$(OS_APP_SUFFIX)
 DEFAULT_APP	= bin/$(OS_APP_PREFIX)$(NICKNAME)-default$(OS_APP_SUFFIX)
@@ -45,6 +54,7 @@ LDFLAGS_SHARED	= $(LDFLAGS_DEBUG)   $(LDFLAGS_CONFIG)  $(LDFLAGS_SYSROOT) \
 
 LDFLAGS_SHARED	+= -Wl,-soname
 LDFLAGS_SHARED	+= -Wl,$(DSO_SONAME)
+LDFLAGS_SHARED	+= $(LDFLAGS_IMPLIB)
 
 LDFLAGS_APP	= $(LDFLAGS_DEBUG)   $(LDFLAGS_CONFIG)  $(LDFLAGS_SYSROOT) \
 		   $(LDFLAGS_COMMON)  $(LDFLAGS_CMDLINE) $(LDFLAGS_HOST)    \
-- 
cgit v1.2.3