Changeset 4705

Timestamp:

Jan 16, 2014 6:33:19 AM (11 years ago)

Author:

ming

Message:

Re #1723: Fixed compilation and linking errors

Location:

pjproject/trunk

Files:

• build.mak.in (modified) (3 diffs)
• pjsip-apps/build/Samples.mak (modified) (2 diffs)
• pjsip/build/Makefile (modified) (1 diff)

pjproject/trunk/build.mak.in

@@ -224 +224 @@
 export PJSIP_UA_LDLIB := -lpjsip-ua-$(TARGET_NAME)
 export PJSUA_LIB_LDLIB := -lpjsua-$(TARGET_NAME)
+export PJSUA2_LIB_LDLIB := -lpjsua2-$(TARGET_NAME)
 else
 export PJLIB_LDLIB := -lpj
@@ -236 +237 @@
 export PJSIP_UA_LDLIB := -lpjsip-ua
 export PJSUA_LIB_LDLIB := -lpjsua
+export PJSUA2_LIB_LDLIB := -lpjsua2
 
 APP_LIB_FILES += $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX) \
@@ -250 +252 @@
 endif
 
-export APP_LDLIBS := $(PJSUA_LIB_LDLIB) \
+export APP_LDLIBS := $(PJSUA2_LIB_LDLIB) \
+        $(PJSUA_LIB_LDLIB) \
         $(PJSIP_UA_LDLIB) \
         $(PJSIP_SIMPLE_LDLIB) \

pjproject/trunk/pjsip-apps/build/Samples.mak

@@ -30 +30 @@
            pjsip-perf \
            pcaputil \
+           pjsua2_demo \
            playfile \
            playsine \
@@ -49 +50 @@
 EXES := $(foreach file, $(SAMPLES), $(file)$(HOST_EXE))
 
-PJSUA2_SAMPLES := pjsua2_demo
+.PHONY: $(EXES)
 
-PJSUA2_EXES := $(foreach file, $(PJSUA2_SAMPLES), $(file)$(HOST_EXE))
-
-.PHONY: $(EXES)
-.PHONY: $(PJSUA2_EXES)
-
-all: $(EXES) $(PJSUA2_EXES)
+all: $(EXES)
 
 $(EXES):
-        $(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" SAMPLE_LDFLAGS="$(_LDFLAGS)" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@)
-
-$(PJSUA2_EXES):
-        $(MAKE) --no-print-directory -f $(RULES_MAK) SAMPLE_SRCDIR=$(SRCDIR) SAMPLE_OBJS=$@.o SAMPLE_CFLAGS="$(_CFLAGS)" 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) -lstdc++" SAMPLE_EXE=$@ APP=SAMPLE app=sample $(subst /,$(HOST_PSEP),$(BINDIR)/$@)
 
 depend:

pjproject/trunk/pjsip/build/Makefile

@@ -245 +245 @@
         $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
 
+pjsua2-lib: $(PJSUA2_LIB_LIB)
+$(PJSUA2_LIB_SONAME): $(PJSUA2_LIB_LIB)
+$(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME): $(PJSUA_LIB) $(PSJUA_LIB_SONAME) $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME)
+        $(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@)
+
 pjsip-test: $(TEST_EXE)
 $(TEST_EXE): $(PJSIP_LIB) $(PJSIP_SONAME)