Changeset 4705


Ignore:
Timestamp:
01/16/14 00:33:19 (5 years ago)
Author:
ming
Message:

Re #1723: Fixed compilation and linking errors

Location:
pjproject/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/build.mak.in

    r4704 r4705  
    224224export PJSIP_UA_LDLIB := -lpjsip-ua-$(TARGET_NAME) 
    225225export PJSUA_LIB_LDLIB := -lpjsua-$(TARGET_NAME) 
     226export PJSUA2_LIB_LDLIB := -lpjsua2-$(TARGET_NAME) 
    226227else 
    227228export PJLIB_LDLIB := -lpj 
     
    236237export PJSIP_UA_LDLIB := -lpjsip-ua 
    237238export PJSUA_LIB_LDLIB := -lpjsua 
     239export PJSUA2_LIB_LDLIB := -lpjsua2 
    238240 
    239241APP_LIB_FILES += $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/pjsip/lib/libpjsua.$(SHLIB_SUFFIX) \ 
     
    250252endif 
    251253 
    252 export APP_LDLIBS := $(PJSUA_LIB_LDLIB) \ 
     254export APP_LDLIBS := $(PJSUA2_LIB_LDLIB) \ 
     255        $(PJSUA_LIB_LDLIB) \ 
    253256        $(PJSIP_UA_LDLIB) \ 
    254257        $(PJSIP_SIMPLE_LDLIB) \ 
  • pjproject/trunk/pjsip-apps/build/Samples.mak

    r4704 r4705  
    3030           pjsip-perf \ 
    3131           pcaputil \ 
     32           pjsua2_demo \ 
    3233           playfile \ 
    3334           playsine \ 
     
    4950EXES := $(foreach file, $(SAMPLES), $(file)$(HOST_EXE)) 
    5051 
    51 PJSUA2_SAMPLES := pjsua2_demo 
     52.PHONY: $(EXES) 
    5253 
    53 PJSUA2_EXES := $(foreach file, $(PJSUA2_SAMPLES), $(file)$(HOST_EXE)) 
    54  
    55 .PHONY: $(EXES) 
    56 .PHONY: $(PJSUA2_EXES) 
    57  
    58 all: $(EXES) $(PJSUA2_EXES) 
     54all: $(EXES) 
    5955 
    6056$(EXES): 
    61         $(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)/$@) 
    62  
    63 $(PJSUA2_EXES): 
    64         $(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)/$@) 
     57        $(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)/$@) 
    6558 
    6659depend: 
  • pjproject/trunk/pjsip/build/Makefile

    r4704 r4705  
    245245        $(MAKE) -f $(RULES_MAK) APP=PJSUA_LIB app=pjsua-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 
    246246 
     247pjsua2-lib: $(PJSUA2_LIB_LIB) 
     248$(PJSUA2_LIB_SONAME): $(PJSUA2_LIB_LIB) 
     249$(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) 
     250        $(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) 
     251 
    247252pjsip-test: $(TEST_EXE) 
    248253$(TEST_EXE): $(PJSIP_LIB) $(PJSIP_SONAME) 
Note: See TracChangeset for help on using the changeset viewer.