summaryrefslogtreecommitdiffhomepage
path: root/project
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-04-24 16:29:50 -0400
committermidipix <writeonce@midipix.org>2016-04-24 17:06:32 -0400
commit1f5b18a8949ecfc942dac4c71f2358b955bde2fe (patch)
treec59c263ed163b3680e662fe9c21b0daa1b384aee /project
parent513c5c3ce6d8fd3878759398748638a1937f54d4 (diff)
downloadslibtool-1f5b18a8949ecfc942dac4c71f2358b955bde2fe.tar.bz2
slibtool-1f5b18a8949ecfc942dac4c71f2358b955bde2fe.tar.xz
build system: PE targets: added import library version support.
Diffstat (limited to 'project')
-rw-r--r--project/custom.mk3
-rw-r--r--project/defs.mk14
2 files changed, 15 insertions, 2 deletions
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) \