Ignore:
Timestamp:
Jan 23, 2014 2:28:41 AM (7 years ago)
Author:
ming
Message:

Re #1723: Modified build system to link with C++ library only for pjsua2 lib or app

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip-apps/src/swig/java/Makefile

    r4704 r4711  
    11include ../../../../build.mak 
     2include ../../../../build/common.mak 
    23 
    34ifneq ($(findstring android,$(TARGET_NAME)),) 
     
    4950  MY_JNI_CFLAGS         = -fPIC 
    5051  MY_JNI_LDFLAGS        = -L$(MY_JDK)/lib 
    51   ifeq ($(OS),darwin) 
    52     MY_JNI_LDFLAGS      := $(MY_JNI_LDFLAGS) -Wl,-soname,pjsua2.so 
    53   endif 
    5452  ifeq ($(OS),android) 
    5553    MY_JNI_CFLAGS       := $(MY_JNI_CFLAGS) -D__ANDROID__ 
     
    6866endif 
    6967MY_JNI_CFLAGS    := $(MY_JNI_CFLAGS) -I$(MY_JDK)/include -I$(MY_JDK)/include/win32 \ 
    70                     -I$(MY_JDK)/include/linux -I. 
     68                    -I$(MY_JDK)/include/linux -I$(MY_JDK)/include/darwin -I. 
    7169 
    7270# Build settings 
    73 MY_CFLAGS        = $(PJ_CFLAGS) $(MY_JNI_CFLAGS) 
    74 MY_LDFLAGS       = $(PJ_LDFLAGS) -lpjsua2-$(TARGET_NAME) $(PJ_LDLIBS) $(MY_JNI_LDFLAGS) 
     71MY_CFLAGS        = $(PJ_CXXFLAGS) $(MY_JNI_CFLAGS) $(CFLAGS) 
     72MY_LDFLAGS       = $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(MY_JNI_LDFLAGS) $(LDFLAGS) 
    7573MY_PACKAGE_NAME  = org.pjsip.pjsua2 
    7674ifeq ($(OS),android) 
Note: See TracChangeset for help on using the changeset viewer.