summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2015-10-23 08:05:12 +0000
committerNanang Izzuddin <nanang@teluu.com>2015-10-23 08:05:12 +0000
commit26931a60da8b7056a1af7534e6aa3db0aa3b6121 (patch)
tree553d942c77f4ae0af99456d12e103a6da6aed28c
parenta6b32de5b6107df932b5c544fdffb2a119351a1b (diff)
Misc (re #1882): Updated libresample makefile to also generate shared library when configure param '--enable-resample-dll' (see also #1462) is specified.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5189 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--third_party/build/resample/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/third_party/build/resample/Makefile b/third_party/build/resample/Makefile
index 72ba28a1..f6b2dc2f 100644
--- a/third_party/build/resample/Makefile
+++ b/third_party/build/resample/Makefile
@@ -23,8 +23,12 @@ export RESAMPLE_CFLAGS = $(_CFLAGS)
export RESAMPLE_LIB := libresample-$(TARGET_NAME)$(LIBEXT)
-ifeq ($(PJ_SHARED_LIBRARIES),)
-else
+ifneq ($(PJ_SHARED_LIBRARIES),)
+export RESAMPLE_SONAME := libresample.$(SHLIB_SUFFIX)
+export RESAMPLE_SHLIB := $(RESAMPLE_SONAME).$(PJ_VERSION_MAJOR)
+endif
+
+ifneq ($(PJ_RESAMPLE_DLL),)
export RESAMPLE_SONAME := libresample.$(SHLIB_SUFFIX)
export RESAMPLE_SHLIB := $(RESAMPLE_SONAME).$(PJ_VERSION_MAJOR)
endif