diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2014-01-23 02:28:41 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2014-01-23 02:28:41 +0000 |
| commit | f0c2e61eb1c3ee704503be5e0703aa05fac73903 (patch) | |
| tree | 577225148541d11dbd58ec67a7197e8da81a85bc /pjsip-apps/src | |
| parent | 355080c169d40ff20866a18bb83b53b3b3e3f9c0 (diff) | |
Re #1723: Modified build system to link with C++ library only for pjsua2 lib or app
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4711 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src')
| -rw-r--r-- | pjsip-apps/src/swig/java/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pjsip-apps/src/swig/java/Makefile b/pjsip-apps/src/swig/java/Makefile index 1946891f..58350b11 100644 --- a/pjsip-apps/src/swig/java/Makefile +++ b/pjsip-apps/src/swig/java/Makefile @@ -1,4 +1,5 @@ include ../../../../build.mak +include ../../../../build/common.mak ifneq ($(findstring android,$(TARGET_NAME)),) OS=android @@ -48,9 +49,6 @@ ifeq ($(OS),Windows_NT) else MY_JNI_CFLAGS = -fPIC MY_JNI_LDFLAGS = -L$(MY_JDK)/lib - ifeq ($(OS),darwin) - MY_JNI_LDFLAGS := $(MY_JNI_LDFLAGS) -Wl,-soname,pjsua2.so - endif ifeq ($(OS),android) MY_JNI_CFLAGS := $(MY_JNI_CFLAGS) -D__ANDROID__ endif @@ -67,11 +65,11 @@ else MY_JAVAC = $(MY_JDK)/javac endif MY_JNI_CFLAGS := $(MY_JNI_CFLAGS) -I$(MY_JDK)/include -I$(MY_JDK)/include/win32 \ - -I$(MY_JDK)/include/linux -I. + -I$(MY_JDK)/include/linux -I$(MY_JDK)/include/darwin -I. # Build settings -MY_CFLAGS = $(PJ_CFLAGS) $(MY_JNI_CFLAGS) -MY_LDFLAGS = $(PJ_LDFLAGS) -lpjsua2-$(TARGET_NAME) $(PJ_LDLIBS) $(MY_JNI_LDFLAGS) +MY_CFLAGS = $(PJ_CXXFLAGS) $(MY_JNI_CFLAGS) $(CFLAGS) +MY_LDFLAGS = $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(MY_JNI_LDFLAGS) $(LDFLAGS) MY_PACKAGE_NAME = org.pjsip.pjsua2 ifeq ($(OS),android) MY_PACKAGE_PATH = android/src/$(subst .,/,$(MY_PACKAGE_NAME)) |