diff options
Diffstat (limited to 'pjsip-apps')
-rw-r--r-- | pjsip-apps/build/Makefile | 12 | ||||
-rw-r--r-- | pjsip-apps/build/Samples.mak | 13 | ||||
-rw-r--r-- | pjsip-apps/src/swig/java/Makefile | 10 |
3 files changed, 16 insertions, 19 deletions
diff --git a/pjsip-apps/build/Makefile b/pjsip-apps/build/Makefile index c776de10..62471e57 100644 --- a/pjsip-apps/build/Makefile +++ b/pjsip-apps/build/Makefile @@ -58,16 +58,8 @@ export PJSYSTEST_EXE:=pjsystest-$(TARGET_NAME)$(HOST_EXE) export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT -############################################################################### -# Main entry -# -# -# x x x x x x x x x x x x x x x x x x x x x x x x -# -# FIX THIS -# -# x x x x x x x x x x x x x x x x x x x x x x x x -TARGETS := $(BINDIR)/$(PJSUA_EXE) $(BINDIR)/$(PJSYSTEST_EXE) samples + +TARGETS := $(PJSUA_EXE) $(PJSYSTEST_EXE) samples all: $(TARGETS) diff --git a/pjsip-apps/build/Samples.mak b/pjsip-apps/build/Samples.mak index 65d25b9f..502f92c4 100644 --- a/pjsip-apps/build/Samples.mak +++ b/pjsip-apps/build/Samples.mak @@ -10,6 +10,7 @@ RULES_MAK := $(PJDIR)/build/rules.mak export _CFLAGS := $(PJ_CFLAGS) $(CFLAGS) export _CXXFLAGS:= $(PJ_CXXFLAGS) export _LDFLAGS := $(PJ_LDFLAGS) $(PJ_LDLIBS) $(LDFLAGS) +export _LDXXFLAGS := $(PJ_LDXXFLAGS) $(PJ_LDXXLIBS) $(LDFLAGS) SRCDIR := ../src/samples OBJDIR := ./output/samples-$(TARGET_NAME) @@ -29,7 +30,6 @@ SAMPLES := auddemo \ mix \ pjsip-perf \ pcaputil \ - pjsua2_demo \ playfile \ playsine \ recfile \ @@ -47,14 +47,21 @@ SAMPLES := auddemo \ tonegen \ vid_streamutil +PJSUA2_SAMPLES := pjsua2_demo + EXES := $(foreach file, $(SAMPLES), $(file)$(HOST_EXE)) +PJSUA2_EXES := $(foreach file, $(PJSUA2_SAMPLES), $(file)$(HOST_EXE)) .PHONY: $(EXES) +.PHONY: $(PJSUA2_EXES) -all: $(EXES) +all: $(EXES) $(PJSUA2_EXES) $(EXES): - $(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" SAMPLE_CXXFLAGS="$(_CXXFLAGS)" SAMPLE_LDFLAGS="$(_LDFLAGS) -lstdc++" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@) + $(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" SAMPLE_CXXFLAGS="$(_CXXFLAGS)" SAMPLE_LDFLAGS="$(_LDFLAGS)" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@) + +$(PJSUA2_EXES): + $(MAKE) --no-print-directory -f $(RULES_MAK) PJSUA2_SAMPLE_SRCDIR=$(SRCDIR) PJSUA2_SAMPLE_OBJS=$@.o PJSUA2_SAMPLE_CFLAGS="$(_CFLAGS)" PJSUA2_SAMPLE_CXXFLAGS="$(_CXXFLAGS)" PJSUA2_SAMPLE_LDFLAGS="$(_LDXXFLAGS)" PJSUA2_SAMPLE_EXE=$@ APP=PJSUA2_SAMPLE app=pjsua2_sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@) depend: 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)) |