1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
From 18b2d54c3ed52506ca31bb48a1516bb08d92eadd Mon Sep 17 00:00:00 2001
From: Zaheer Abbas Merali <zaheermerali@gmail.com>
Date: Tue, 13 Jan 2015 11:15:25 -0800
Subject: [PATCH] Add version suffix
---
Makefile | 2 +-
build/platform-android.mk | 5 +++--
build/platform-freebsd.mk | 1 +
build/platform-linux.mk | 1 +
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 4fa3095..3b9ff8b 100644
--- a/Makefile
+++ b/Makefile
@@ -181,7 +181,7 @@ endif
endif
ifneq (ios, $(OS))
-libraries: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX)
+libraries: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
else
libraries: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX)
endif
diff --git a/build/platform-android.mk b/build/platform-android.mk
index aab007d..e95d270 100644
--- a/build/platform-android.mk
+++ b/build/platform-android.mk
@@ -1,9 +1,10 @@
ARCH = arm
include $(SRC_PATH)build/arch.mk
+SHAREDLIB_DIR = $(PREFIX)/lib
SHAREDLIBSUFFIX = so
# Android APK/JARs expect libraries to be unversioned
-SHAREDLIBSUFFIXVER=$(SHAREDLIBSUFFIX)
-SHLDFLAGS =
+SHAREDLIBSUFFIXVER=$(SHAREDLIBSUFFIX).$(SHAREDLIBVERSION)
+SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
NDKLEVEL = 12
ifeq ($(ARCH), arm)
ifneq ($(APP_ABI), armeabi)
diff --git a/build/platform-freebsd.mk b/build/platform-freebsd.mk
index 49be825..3d0feaa 100644
--- a/build/platform-freebsd.mk
+++ b/build/platform-freebsd.mk
@@ -1,4 +1,5 @@
include $(SRC_PATH)build/arch.mk
+SHAREDLIB_DIR = $(PREFIX)/lib
SHAREDLIBSUFFIX = so
SHAREDLIBSUFFIXVER=$(SHAREDLIBSUFFIX).$(SHAREDLIBVERSION)
SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
diff --git a/build/platform-linux.mk b/build/platform-linux.mk
index bb0dd84..e98b972 100644
--- a/build/platform-linux.mk
+++ b/build/platform-linux.mk
@@ -1,4 +1,5 @@
include $(SRC_PATH)build/arch.mk
+SHAREDLIB_DIR = $(PREFIX)/lib
SHAREDLIBSUFFIX = so
SHAREDLIBSUFFIXVER=$(SHAREDLIBSUFFIX).$(SHAREDLIBVERSION)
SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
--
1.9.1
|
