aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2022-02-19 20:12:14 +0100
committerMattias Andrée <maandree@kth.se>2022-02-19 20:12:14 +0100
commitd8f9921d508d415c7172a973d40f6a293470372a (patch)
tree74c721c568488b9a41c2cadb19ada77f6cb01eee
parentAdd readme (diff)
downloadlibtracebitmap-d8f9921d508d415c7172a973d40f6a293470372a.tar.gz
libtracebitmap-d8f9921d508d415c7172a973d40f6a293470372a.tar.bz2
libtracebitmap-d8f9921d508d415c7172a973d40f6a293470372a.tar.xz
Fix linking for Windows and Mac OS
Signed-off-by: Mattias Andrée <maandree@kth.se>
-rw-r--r--Makefile1
-rw-r--r--mk/linux.mk2
-rw-r--r--mk/macos.mk4
-rw-r--r--mk/windows.mk4
4 files changed, 9 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 5390abd..02b0018 100644
--- a/Makefile
+++ b/Makefile
@@ -50,6 +50,7 @@ install: libtracebitmap.a libtracebitmap.$(LIBEXT)
mkdir -p -- "$(DESTDIR)$(PREFIX)/include"
cp -- libtracebitmap.a "$(DESTDIR)$(PREFIX)/lib/"
cp -- libtracebitmap.$(LIBEXT) "$(DESTDIR)$(PREFIX)/lib/libtracebitmap.$(LIBMINOREXT)"
+ $(FIX_INSTALL_NAME) "$(DESTDIR)$(PREFIX)/lib/libtracebitmap.$(LIBMINOREXT)"
ln -sf -- libtracebitmap.$(LIBMINOREXT) "$(DESTDIR)$(PREFIX)/lib/libtracebitmap.$(LIBMAJOREXT)"
ln -sf -- libtracebitmap.$(LIBMAJOREXT) "$(DESTDIR)$(PREFIX)/lib/libtracebitmap.$(LIBEXT)"
cp -- libtracebitmap.h "$(DESTDIR)$(PREFIX)/include/"
diff --git a/mk/linux.mk b/mk/linux.mk
index d016d31..ad58f69 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -2,3 +2,5 @@ LIBEXT = so
LIBFLAGS = -shared -Wl,-soname,lib$(LIB_NAME).$(LIBEXT).$(LIB_MAJOR)
LIBMAJOREXT = $(LIBEXT).$(LIB_MAJOR)
LIBMINOREXT = $(LIBEXT).$(LIB_VERSION)
+
+FIX_INSTALL_NAME = :
diff --git a/mk/macos.mk b/mk/macos.mk
index bd92de6..a31350a 100644
--- a/mk/macos.mk
+++ b/mk/macos.mk
@@ -1,4 +1,6 @@
LIBEXT = dylib
-LIBFLAGS = -dynamiclib
+LIBFLAGS = -dynamiclib -Wl,-compatibility_version,$(LIB_MAJOR) -Wl,-current_version,$(LIB_VERSION)
LIBMAJOREXT = $(LIB_MAJOR).$(LIBEXT)
LIBMINOREXT = $(LIB_VERSION).$(LIBEXT)
+
+FIX_INSTALL_NAME = install_name_tool -id "$(PREFIX)/lib/libtracebitmap.$(LIBMAJOREXT)"
diff --git a/mk/windows.mk b/mk/windows.mk
index e9602e1..ed5ec8d 100644
--- a/mk/windows.mk
+++ b/mk/windows.mk
@@ -1,4 +1,6 @@
LIBEXT = dll
-LIBFLAGS = -mdll
+LIBFLAGS = -shared
LIBMAJOREXT = $(LIB_MAJOR).$(LIBEXT)
LIBMINOREXT = $(LIB_VERSION).$(LIBEXT)
+
+FIX_INSTALL_NAME = :